Hotplug: also close thread on language change
[enigma2.git] / timer.py
index 35578ed..aaae0b2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -245,6 +245,8 @@ class Timer:
                self.addTimerEntry(timer)
        
        def doActivate(self, w):
+               self.timer_list.remove(w)
+
                # when activating a timer which has already passed,
                # simply abort the timer. don't run trough all the stages.
                if w.shouldSkip():
@@ -256,8 +258,6 @@ class Timer:
                        if w.activate():
                                w.state += 1
 
-               self.timer_list.remove(w)
-
                # did this timer reached the last state?
                if w.state < TimerEntry.StateEnded:
                        # no, sort it into active list