commit 4db38bc8322444ea6be09583f893358d8017ba5d
author Andrew Jeffery <andrew@aj.id.au> Thu Mar 24 13:42:41 2022 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Mar 29 13:52:05 2022 +1030
tree dc59e31518f27565a4b95d2db76af2987c0da474
parent 89ec3521eb28aaf050daad6cd99adf1db4bbc431

EntityManager: Refactor pruneDevice() early-exits

Clean up the condition to improve readability.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: If4d65a8d757aaf5c4fa57ae6b455d0ad11e2a358

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 141b0ba..d409365 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -861,17 +861,8 @@
         return;
     }
 
-    bool requirePowerOn = deviceRequiresPowerOn(device);
-
-    if (powerOff && requirePowerOn)
+    if (deviceRequiresPowerOn(device) && (powerOff || scannedPowerOff))
     {
-        // power not on yet, don't know if it's there or not
-        return;
-    }
-
-    if (!powerOff && scannedPowerOff && requirePowerOn)
-    {
-        // already logged it when power was off
         return;
     }