X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=b131e5bf2d5a118642099412049a85d84dabd5df;hp=386e03f06da3841063b3b5b063c5af81a87f7c82;hb=28a8b65725c90de53f1d0bfc7ab8fb713d9dac27;hpb=6d5483c0835b27268da7bc6081ed6db330cffa72

diff --git a/RecordTimer.py b/RecordTimer.py
index 386e03f..b131e5b 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)