sorry, i REALLY don't know, how to fix it other than using a try/except block

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 134079586df374d7a0881d5839550e549eb986f5..18cc64ab4bd2be40b4f9de40df5a0c7dc8377b60 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -162,7 +162,12 @@ class RecordTimer(timer.Timer):
                        self.timeChanged(entry)
                elif entry.state != timer.TimerEntry.StateEnded:
                        entry.activate(timer.TimerEntry.EventAbort)
                        self.timeChanged(entry)
                elif entry.state != timer.TimerEntry.StateEnded:
                        entry.activate(timer.TimerEntry.EventAbort)

-                       self.timer_list.remove(entry)
+                       try: # FIXME: is needed, because after loading the timers, every timer (even already ended ones)
+                                # have the state EventWaiting..
+                               self.timer_list.remove(entry)
+                       except:
+                               pass
+                               

                        self.calcNextActivation()
                        print "timer did not yet start - removing"
                else:
                        self.calcNextActivation()
                        print "timer did not yet start - removing"
                else:


@@ -172,7 +177,10 @@ class RecordTimer(timer.Timer):
                print "in processed: ", entry in self.processed_timers
                print "in running: ", entry in self.timer_list
                # now the timer should be in the processed_timers list. remove it from there.
                print "in processed: ", entry in self.processed_timers
                print "in running: ", entry in self.timer_list
                # now the timer should be in the processed_timers list. remove it from there.

-               self.processed_timers.remove(entry)
+               try:
+                       self.processed_timers.remove(entry)
+               except:
+                       pass

 
        def shutdown(self):
                self.saveTimer()
 
        def shutdown(self):
                self.saveTimer()