fix cancellation of broken timer entries

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 432c53aca0424fdc1092c6c5e8c79d1d783a9555..3caa288db0a81cd2e56b04756175d02bf2774d9c 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -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():
@@ -113,6 +115,11 @@ class Timer:
                for f in self.on_state_change:
                        f(entry)
                        
+       def getNextRecordingTime(self):
+               if len(self.timer_list) > 0:
+                       return self.timer_list[0].begin
+               return -1
+                       
        def cleanup(self):
                self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
        
@@ -163,7 +170,10 @@ class Timer:
        
        def timeChanged(self, timer):
                timer.timeChanged()
-               self.timer_list.remove(timer)
+               if timer.state == TimerEntry.StateEnded:
+                       self.processed_timers.remove(timer)
+               else:
+                       self.timer_list.remove(timer)
 
                self.addTimerEntry(timer)