X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ea2e46b48524f14bb53b87846c07aa97444a513a..cb52eb273bed4c28716b501fbbf128d2c7046d57:/timer.py?ds=sidebyside

diff --git a/timer.py b/timer.py
index 6f33b54d..bbad0be1 100644
--- a/timer.py
+++ b/timer.py
@@ -27,6 +27,9 @@ class TimerEntry:
 		self.repeated |= (2 ** day)
 		print "Repeated: " + str(self.repeated)
 		
+	def isRunning(self):
+		return self.state == self.StateRunning
+		
 	# update self.begin and self.end according to the self.repeated-flags
 	def processRepeated(self):
 		print "ProcessRepeated"
@@ -95,15 +98,15 @@ class Timer:
 	def addTimerEntry(self, entry, noRecalc=0):
 		entry.processRepeated()
 
-		# we either go trough Prepare/Start/End-state if the timer is still running,
-		# or skip it when it's alrady past the end.
-		
-		if entry.end > time.time():
+		# when the timer has not yet started, and is already passed,
+		# don't go trough waiting/running/end-states, but sort it
+		# right into the processedTimers.
+		if entry.end <= time.time() and entry.state == TimerEntry.StateWait:
+			bisect.insort(self.processed_timers, entry)
+		else:
 			bisect.insort(self.timer_list, entry)
 			if not noRecalc:
 				self.calcNextActivation()
-		else:
-			bisect.insort(self.processed_timers, entry)
 	
 	def setNextActivation(self, when):
 		delay = int((when - time.time()) * 1000)
@@ -141,7 +144,7 @@ class Timer:
 	def doActivate(self, w):
 		w.activate(w.state)
 		self.timer_list.remove(w)
-
+		
 		w.state += 1
 		if w.state < TimerEntry.StateEnded:
 			bisect.insort(self.timer_list, w)
@@ -153,7 +156,6 @@ class Timer:
 			else:
 				bisect.insort(self.processed_timers, w)
 
-	
 	def processActivation(self):
 		t = int(time.time()) + 1