X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d7a21e41d75201806e8f7eed47b0097bc811d56b..a56c1726adef67d68f66ea3e27e2fa7d4bf0978d:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 62fa6370..d893382a 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -155,6 +155,8 @@ class RecordTimer(timer.Timer):
 
 	def removeEntry(self, entry):
 		print "[Timer] Remove " + str(entry)
+		
+		entry.repeated = False
 
 		if entry.state == timer.TimerEntry.StateRunning:
 			print "remove running timer."
@@ -162,14 +164,13 @@ class RecordTimer(timer.Timer):
 			self.timeChanged(entry)
 		elif entry.state != timer.TimerEntry.StateEnded:
 			entry.activate(timer.TimerEntry.EventAbort)
-			try: # FIXME: is needed, because after loading the timers, every timer (even already ended ones)
-				 # have the state EventWaiting..
-				self.timer_list.remove(entry)
-			except:
-				pass
-				
+			self.timer_list.remove(entry)
+
 			self.calcNextActivation()
 			print "timer did not yet start - removing"
+
+			# the timer was aborted, and removed.
+			return
 		else:
 			print "timer did already end - doing nothing."