X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEdit.py;h=bbbf6b5fe446cf7cc126f8496a614c5e70d87bc0;hp=018e28dc09d6815acc7bc4408e38b9098714e236;hb=3604798b6ce86c19cb3e045b0808b91ea7dc3a3a;hpb=e1342ca063df18d3b933420150d06b86ea506bb3

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 018e28d..bbbf6b5 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -63,8 +63,14 @@ class TimerEditList(Screen):
 		self.updateState()
 		
 	def toggleDisabledState(self):
-		self["timerlist"].getCurrent()[0].disabled = not self["timerlist"].getCurrent()[0].disabled
-		self.session.nav.RecordTimer.timeChanged(self["timerlist"].getCurrent()[0])
+		t = self["timerlist"].getCurrent()[0]
+		
+		if t.disabled:
+			t.enable()
+		else:
+			t.disable()
+
+		self.session.nav.RecordTimer.timeChanged(t)
 		self.updateState()
 		self.refill()
 		
@@ -103,9 +109,11 @@ class TimerEditList(Screen):
 		
 	def removeTimer(self):
 		list = self["timerlist"]
-		timer = list.getCurrent()[0]
-		self.session.nav.RecordTimer.removeEntry(timer)
-		self.refill()
+		cur = list.getCurrent()
+		if cur is not None:
+			timer = cur[0]
+			self.session.nav.RecordTimer.removeEntry(timer)
+			self.refill()
 	
 	def refill(self):
 		self.fillTimerList()