X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..c7a7c847e336cc9d46fe8b4b52f21ced036a8c4f:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index caedc1ee..b131e5bf 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -61,6 +61,7 @@ class RecordTimerEntry(timer.TimerEntry):
 	
 	def resetState(self):
 		self.state = self.StateWaiting
+		self.cancelled = False
 		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:
+			# 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)
@@ -166,8 +171,9 @@ class RecordTimerEntry(timer.TimerEntry):
 				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):