X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67ac08bd138e956111e98a80a3c3adabf5e71d48..8b6a8658b1ea5aa358947a488c80eff75295d0fb:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 2c7afef5..4a4185c3 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -3,12 +3,11 @@ from Components.TimerList import TimerList, TimerEntryComponent
 from Components.ConfigList import ConfigList
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
-from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
 from Screens.MessageBox import MessageBox
 from TimerEntry import TimerEntry, TimerLog
-from RecordTimer import RecordTimerEntry, parseEvent
+from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from time import *
 from ServiceReference import ServiceReference
 from Components.config import *
@@ -63,10 +62,18 @@ 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])
-		self.updateState()
-		self.refill()
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			t = cur[0]
+		
+			if t.disabled:
+				t.enable()
+			else:
+				t.disable()
+
+			self.session.nav.RecordTimer.timeChanged(t)
+			self.updateState()
+			self.refill()
 		
 	def updateState(self):
 		if len(self.list) > 0:
@@ -87,12 +94,15 @@ class TimerEditList(Screen):
 		self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
 	def showLog(self):
-		self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0])
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			self.session.openWithCallback(self.finishedEdit, TimerLog, cur[0])
 
 	def openEdit(self):
-		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
-		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
-		
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			self.session.openWithCallback(self.finishedEdit, TimerEntry, cur[0])
+
 	def cleanupQuestion(self):
 		self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?"))
 	
@@ -104,8 +114,9 @@ class TimerEditList(Screen):
 	def removeTimer(self):
 		list = self["timerlist"]
 		cur = list.getCurrent()
-		if cur is not None:
+		if cur:
 			timer = cur[0]
+			timer.afterEvent = AFTEREVENT.NONE
 			self.session.nav.RecordTimer.removeEntry(timer)
 			self.refill()
 	
@@ -129,7 +140,7 @@ class TimerEditList(Screen):
 		else:
 			data = parseEvent(event)
 
-		self.addTimer(RecordTimerEntry(serviceref, *data))
+		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)