X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=track-presence.py;fp=track-presence.py;h=012b222a773026df6fc0cf46b84c38bf4fc91443;hb=f6f7a3881559f7410f20698d08f68a8f7b9fd2cc;hp=891ccf79c4c9afa63f1a66b347873dc9dc2ddf87;hpb=d60ba8aa4d7b60a15bdc8030a7e73fcc4810c48c;p=svn42.git

diff --git a/track-presence.py b/track-presence.py
index 891ccf7..012b222 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -393,7 +393,7 @@ class StatusTracker: #(threading.Thread):
       elif not self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone):
         self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
         return self.last_somebody_present_result
-      elif self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch) and self.door_manual_switch_used:
+      elif self.door_manual_switch_used and self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch):
         return True
       elif self.last_movement_unixts > self.last_door_operation_unixts and time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout):
         return True