X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6db060dce242cd1990ae82f518ffa0beaee74d06..edf2e7b1a646ca0a35ac2bc92e97a4b4b29c74f7:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 3497fcbe..5a7109f2 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -130,10 +130,12 @@ class TimerEditList(Screen):
 		if delete:
 			self.session.nav.RecordTimer.cleanup()
 			self.refill()
-	
+
 	def removeTimerQuestion(self):
+		if not self["timerlist"].getCurrent():
+			return
 		self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
-		
+
 	def removeTimer(self, result):
 		if not result:
 			return
@@ -146,8 +148,15 @@ class TimerEditList(Screen):
 			self.refill()
 	
 	def refill(self):
+		oldsize = len(self.list)
 		self.fillTimerList()
-		self["timerlist"].invalidate()
+		lst = self["timerlist"]
+		newsize = len(self.list)
+		if oldsize and oldsize != newsize:
+			idx = lst.getCurrentIndex()
+			lst.entryRemoved(idx)
+		else:
+			lst.invalidate()
 	
 	def addCurrentTimer(self):
 		event = None