- if entry.state == TimerEntry.StateRunning:
- entry.End = time.time()
- print "aborting timer"
- elif entry.state != TimerEntry.StateEnded:
- entry.activate(TimerEntry.EventAbort)
- self.timer_list.remove(entry)
+ print "[Timer] Remove " + str(entry)
+
+ if entry.state == timer.TimerEntry.StateRunning:
+ print "remove running timer."
+ entry.end = time.time()
+ 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.calcNextActivation()