git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
[enigma2.git]
/
timer.py
diff --git
a/timer.py
b/timer.py
index 64df9c8854780ffb4b19732d5425d62667afc67e..35578ed8b72389a8c22b69bf4bbe86b8e4bfe3b2 100644
(file)
--- a/
timer.py
+++ b/
timer.py
@@
-245,8
+245,6
@@
class Timer:
self.addTimerEntry(timer)
def doActivate(self, w):
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():
# when activating a timer which has already passed,
# simply abort the timer. don't run trough all the stages.
if w.shouldSkip():
@@
-258,6
+256,8
@@
class Timer:
if w.activate():
w.state += 1
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
# did this timer reached the last state?
if w.state < TimerEntry.StateEnded:
# no, sort it into active list