X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/64a629d1dd12dbe16b6d8a74a2f2dc3425fef138..10194a885f07b7d024aa806515a13588263d71e7:/timer.py

diff --git a/timer.py b/timer.py
index 169d3294..09f64e3f 100644
--- a/timer.py
+++ b/timer.py
@@ -114,11 +114,7 @@ class Timer:
 			f(entry)
 			
 	def cleanup(self):
-		new_processed_timers = []
-		for x in self.processed_timers:
-			if x.disabled:
-				new_processed_timers.append(x)
-		self.processed_timers = new_processed_timers
+		self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
 	
 	def addTimerEntry(self, entry, noRecalc=0):
 		entry.processRepeated()
@@ -167,7 +163,10 @@ class Timer:
 	
 	def timeChanged(self, timer):
 		timer.timeChanged()
-		self.timer_list.remove(timer)
+		if timer.state == TimerEntry.StateEnded:
+			self.processed_timers.remove(timer)
+		else:
+			self.timer_list.remove(timer)
 
 		self.addTimerEntry(timer)
 	
@@ -177,8 +176,7 @@ class Timer:
 		# when activating a timer which has already passed,
 		# simply abort the timer. don't run trough all the stages.
 		if w.shouldSkip():
-			w.abort()
-			bisect.insort(self.processed_timers, w)
+			w.state = TimerEntry.StateEnded
 		else:
 			# when active returns true, this means "accepted".
 			# otherwise, the current state is kept.