timer: fix remove of timer

2 files changed, 13 insertions, 12 deletions

diff --git a/RecordTimer.py b/RecordTimer.py
index e26bda60..45a21aeb 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -148,7 +148,9 @@ class RecordTimer(timer.Timer):
 
 	def removeEntry(self, entry):
 		print "[Timer] Remove " + str(entry)
+
 		if entry.state == timer.TimerEntry.StateRunning:
+			print "remove running timer."
 			entry.end = time.time()
 			self.timeChanged(entry)
 		elif entry.state != timer.TimerEntry.StateEnded:
@@ -159,11 +161,11 @@ class RecordTimer(timer.Timer):
 		else:
 			print "timer did already end - doing nothing."
 		
+		print "state: ", entry.state
+		print "in processed: ", entry in self.processed_timers
+		print "in running: ", entry in self.timer_list
 		# now the timer should be in the processed_timers list. remove it from there.
-		try:
-			self.processed_timers.remove(entry)
-		except:
-			pass
+		self.processed_timers.remove(entry)
 
 	def shutdown(self):
 		self.saveTimer()
diff --git a/timer.py b/timer.py
index 42bafe35..bbad0be1 100644
--- a/timer.py
+++ b/timer.py
@@ -98,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)
@@ -144,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)
@@ -156,7 +156,6 @@ class Timer:
 			else:
 				bisect.insort(self.processed_timers, w)
 
-	
 	def processActivation(self):
 		t = int(time.time()) + 1