Fixed bug in Delay (caught by Travis)

tuomas2 · Jul 7, 2015 · 57dcbe2 · 57dcbe2
1 parent d46a4a2
commit 57dcbe2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/automate/callables/builtin_callables.py b/automate/callables/builtin_callables.py
@@ -511,10 +511,14 @@ def cancel(self, caller):
     def _run(self, caller, timer, **kwargs):
         self.logger.info("Time is up, running %s", self)
         for i in self.objects:
+            if not caller in self.state:
+                # cancelled
+                return
             self.call_eval(i, caller, **kwargs)
 
         with self._lock:
-            self.get_state(caller).timers.remove(timer)
+            if caller in self.state: # if not cancelled
+                self.get_state(caller).timers.remove(timer)
         return True