git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for picture in picture into the infobar (by pressing the blue button)
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index caedc1ee8d9cd8608989b6a650666d1f82fd07a9..b131e5bf2d5a118642099412049a85d84dabd5df 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-61,6
+61,7
@@
class RecordTimerEntry(timer.TimerEntry):
def resetState(self):
self.state = self.StateWaiting
def resetState(self):
self.state = self.StateWaiting
+ self.cancelled = False
self.first_try_prepare = True
self.timeChanged()
self.first_try_prepare = True
self.timeChanged()
@@
-148,6
+149,10
@@
class RecordTimerEntry(timer.TimerEntry):
self.start_prepare = time.time() + self.backoff
return False
elif next_state == self.StateRunning:
self.start_prepare = time.time() + self.backoff
return False
elif next_state == self.StateRunning:
+ # if this timer has been cancelled, just go to "end" state.
+ if self.cancelled:
+ return True
+
if self.justplay:
self.log(11, "zapping")
NavigationInstance.instance.playService(self.service_ref.ref)
if self.justplay:
self.log(11, "zapping")
NavigationInstance.instance.playService(self.service_ref.ref)
@@
-166,8
+171,9
@@
class RecordTimerEntry(timer.TimerEntry):
return True
elif next_state == self.StateEnded:
self.log(12, "stop recording")
return True
elif next_state == self.StateEnded:
self.log(12, "stop recording")
- self.record_service.stop()
- self.record_service = None
+ if not self.justplay:
+ self.record_service.stop()
+ self.record_service = None
return True
def getNextActivation(self):
return True
def getNextActivation(self):