X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d5b15f3ca1f7f92f949906d0199f9266d845e31..008374f6e4be8d83cad04a411ecf0124702e7302:/timer.py

diff --git a/timer.py b/timer.py
index 9fa0ab2a..c03eb1e7 100644
--- a/timer.py
+++ b/timer.py
@@ -16,6 +16,8 @@ class TimerEntry:
 		self.resetRepeated()
 		self.backoff = 0
 		
+		self.disabled = False
+		
 	def resetRepeated(self):
 		self.repeated = int(0)
 
@@ -110,6 +112,9 @@ class Timer:
 	def stateChanged(self, entry):
 		for f in self.on_state_change:
 			f(entry)
+			
+	def cleanup(self):
+		self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
 	
 	def addTimerEntry(self, entry, noRecalc=0):
 		entry.processRepeated()
@@ -117,7 +122,7 @@ class Timer:
 		# 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.shouldSkip() or entry.state == TimerEntry.StateEnded:
+		if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
 			print "already passed, skipping"
 			bisect.insort(self.processed_timers, entry)
 			entry.state = TimerEntry.StateEnded