Merge remote-tracking branch 'upstream/release-7.5.0' into chore/merge-release-into-dev-21-16-12

2021-12-16 13:38:43 +00:00 · 2021-12-16 13:38:43 +00:00 · e9b2280fc3
commit e9b2280fc3
parent 41c7e2a8c1 13b42b0753
33 changed files with 250 additions and 64 deletions
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@ -61,7 +61,7 @@ function addName (pings, events, config) {
    const statuses = [
      getStatus(
        _.first(pings[machine.deviceId]),
-        _.first(checkStuckScreen(events, machine.name))
+        _.first(checkStuckScreen(events, machine))
      )
    ]