git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better tabs?
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index 62fa6370a336d289f7fa700d32a32ca5838c9706..d893382a228b8b132e8d8d03ea12143db9bd68dd 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-155,6
+155,8
@@
class RecordTimer(timer.Timer):
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)
+
+ entry.repeated = False
if entry.state == timer.TimerEntry.StateRunning:
print "remove running timer."
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)
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"
self.calcNextActivation()
print "timer did not yet start - removing"
+
+ # the timer was aborted, and removed.
+ return
else:
print "timer did already end - doing nothing."
else:
print "timer did already end - doing nothing."