X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=timer.py;h=d58a83ef8ef68db5255e1e8a054dbaf258964340;hb=4c9a352c0ebe1709a4a5f1e9d2529b77de6d780e;hp=fd5bb5afe00e6655ce1c0ccc28df57a06d6a95c4;hpb=a4b8eb676ba549ebe8cf347f15888e51d8914789;p=vuplus_dvbapp

diff --git a/timer.py b/timer.py
index fd5bb5a..d58a83e 100644
--- a/timer.py
+++ b/timer.py
@@ -222,7 +222,7 @@ class Timer:
 		min = int(time()) + self.MaxWaitTime
 		
 		# calculate next activation point
-		if len(self.timer_list):
+		if self.timer_list:
 			w = self.timer_list[0].getNextActivation()
 			if w < min:
 				min = w
@@ -232,6 +232,10 @@ class Timer:
 		self.setNextActivation(min)
 	
 	def timeChanged(self, timer):
+		if timer not in (self.processed_timers + self.timer_list):
+			print "timer not found"
+			return
+
 		print "time changed"
 		timer.timeChanged()
 		if timer.state == TimerEntry.StateEnded:
@@ -246,7 +250,7 @@ class Timer:
 	
 	def doActivate(self, w):
 		self.timer_list.remove(w)
-		
+
 		# when activating a timer which has already passed,
 		# simply abort the timer. don't run trough all the stages.
 		if w.shouldSkip():
@@ -278,5 +282,5 @@ class Timer:
 		t = int(time()) + 1
 		
 		# we keep on processing the first entry until it goes into the future.
-		while len(self.timer_list) and self.timer_list[0].getNextActivation() < t:
+		while self.timer_list and self.timer_list[0].getNextActivation() < t:
 			self.doActivate(self.timer_list[0])