diff options
| -rw-r--r-- | RecordTimer.py | 5 | ||||
| -rw-r--r-- | timer.py | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/RecordTimer.py b/RecordTimer.py index 386e03f0..b131e5bf 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -61,6 +61,7 @@ class RecordTimerEntry(timer.TimerEntry): def resetState(self): self.state = self.StateWaiting + self.cancelled = False self.first_try_prepare = True self.timeChanged() @@ -148,6 +149,10 @@ class RecordTimerEntry(timer.TimerEntry): self.start_prepare = time.time() + self.backoff return False elif next_state == self.StateRunning: + # if this timer has been cancelled, just go to "end" state. + if self.cancelled: + return True + if self.justplay: self.log(11, "zapping") NavigationInstance.instance.playService(self.service_ref.ref) @@ -81,6 +81,8 @@ class TimerEntry: # set begin to now. if self.begin > self.end: self.begin = self.end + + self.cancelled = True # must be overridden! def getNextActivation(): |