translate frontprocessor version in about box

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 48ba7696c834d8866b369ed2770a5456edc408f7..09f64e3f8abbe9e9ca890599f20bcd0b5f017070 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -114,7 +114,7 @@ class Timer:
                        f(entry)
                        
        def cleanup(self):
-               self.processed_timers = []
+               self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
        
        def addTimerEntry(self, entry, noRecalc=0):
                entry.processRepeated()
@@ -163,7 +163,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)
        
@@ -173,8 +176,7 @@ class Timer:
                # when activating a timer which has already passed,
                # simply abort the timer. don't run trough all the stages.
                if w.shouldSkip():
-                       w.abort()
-                       bisect.insort(self.processed_timers, w)
+                       w.state = TimerEntry.StateEnded
                else:
                        # when active returns true, this means "accepted".
                        # otherwise, the current state is kept.