Merge branch 'dev' into fix/machine_upairing

2021-12-24 23:49:55 +01:00 · 2021-12-24 23:49:55 +01:00 · 29dc519a52
commit 29dc519a52
parent 6521d45ab5 7461a93f7c
126 changed files with 2007 additions and 1281 deletions
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@ -66,7 +66,7 @@ function addName (pings, events, config) {
    const statuses = [
      getStatus(
        _.first(pings[machine.deviceId]),
-        _.first(checkStuckScreen(events, machine.name))
+        _.first(checkStuckScreen(events, machine))
      )
    ]