fix timer skip

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 169d3294f1b0666d653231da0628673287c7c749..432c53aca0424fdc1092c6c5e8c79d1d783a9555 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -114,11 +114,7 @@ class Timer:
                        f(entry)
                        
        def cleanup(self):
-               new_processed_timers = []
-               for x in self.processed_timers:
-                       if x.disabled:
-                               new_processed_timers.append(x)
-               self.processed_timers = new_processed_timers
+               self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
        
        def addTimerEntry(self, entry, noRecalc=0):
                entry.processRepeated()
@@ -177,8 +173,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.