Merge branch 'master' of https://github.com/unixmedia/domotikad

6310e3db · nextime · 6c34d651 · 03f4bdf3 · 6310e3db
Commit 6310e3db authored Sep 27, 2014 by nextime
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

domotika.py domotika/domotika.py +5 -0

No files found.
--- a/domotika/domotika.py
+++ b/domotika/domotika.py
@@ -1564,6 +1564,11 @@ class domotikaService(service.Service):
               # normally and go to next step in normal timing
               exstep=True
               immediatenext=False
+         else:
+            if res.condition_act in ['GOTOSTEP','STOP','RESTART','IGNORE','NEXT']:
+               exstep=True
+               immediatenext=False
+


      if exstep: