better tabs?
[enigma2.git] / RecordTimer.py
index 62fa637..d893382 100644 (file)
@@ -155,6 +155,8 @@ class RecordTimer(timer.Timer):
 
        def removeEntry(self, entry):
                print "[Timer] Remove " + str(entry)
+               
+               entry.repeated = False
 
                if entry.state == timer.TimerEntry.StateRunning:
                        print "remove running timer."
@@ -162,14 +164,13 @@ class RecordTimer(timer.Timer):
                        self.timeChanged(entry)
                elif entry.state != timer.TimerEntry.StateEnded:
                        entry.activate(timer.TimerEntry.EventAbort)
-                       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.timer_list.remove(entry)
+
                        self.calcNextActivation()
                        print "timer did not yet start - removing"
+
+                       # the timer was aborted, and removed.
+                       return
                else:
                        print "timer did already end - doing nothing."