git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cleanup
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index 45a21aebfd02db9d99cd30418fa2a8375aa4224f..62fa6370a336d289f7fa700d32a32ca5838c9706 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-103,6
+103,13
@@
class RecordTimer(timer.Timer):
self.loadTimer()
except:
print "unable to load timers from file!"
self.loadTimer()
except:
print "unable to load timers from file!"
+
+ def isRecording(self):
+ isRunning = False
+ for timer in self.timer_list:
+ if timer.isRunning():
+ isRunning = True
+ return isRunning
def loadTimer(self):
# TODO: PATH!
def loadTimer(self):
# TODO: PATH!
@@
-155,7
+162,12
@@
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)
- self.timer_list.remove(entry)
+ 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()
print "timer did not yet start - removing"
else:
self.calcNextActivation()
print "timer did not yet start - removing"
else: