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 e26bda6078e2136ada32856017e55ff82ae571c5..d893382a228b8b132e8d8d03ea12143db9bd68dd 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!
@@
-148,22
+155,30
@@
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:
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)
self.timer_list.remove(entry)
entry.end = time.time()
self.timeChanged(entry)
elif entry.state != timer.TimerEntry.StateEnded:
entry.activate(timer.TimerEntry.EventAbort)
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."
+ print "state: ", entry.state
+ print "in processed: ", entry in self.processed_timers
+ print "in running: ", entry in self.timer_list
# now the timer should be in the processed_timers list. remove it from there.
# now the timer should be in the processed_timers list. remove it from there.
- try:
- self.processed_timers.remove(entry)
- except:
- pass
+ self.processed_timers.remove(entry)
def shutdown(self):
self.saveTimer()
def shutdown(self):
self.saveTimer()