X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eda1dbddffe8019b2a4a6e34bfc3543e405f59b1..edf2e7b1a646ca0a35ac2bc92e97a4b4b29c74f7:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 4f1d6d68..3541d36d 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -84,8 +84,8 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
 			self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", _("go to deep standby"))], default = afterevent)
 			self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type)
-			self.timerentry_name = ConfigText(default = self.timer.name, fixed_size = False)
-			self.timerentry_description = ConfigText(default = self.timer.description, fixed_size = False)
+			self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False)
+			self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False)
 
 			self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("daily", _("daily")), ("weekly", _("weekly")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))])
 
@@ -109,6 +109,7 @@ class TimerEntry(Screen, ConfigListScreen):
 				servicename = str(self.timer.service_ref.getServiceName())
 			except:
 				pass
+			self.timerentry_service_ref = self.timer.service_ref
 			self.timerentry_service = ConfigSelection([servicename])
 			
 			self.timerentry_startdate.addNotifier(self.checkDate)
@@ -215,8 +216,8 @@ class TimerEntry(Screen, ConfigListScreen):
 
 	def finishedChannelSelection(self, *args):
 		if len(args):
-			self.timer.service_ref = ServiceReference(args[0])
-			self.timerentry_service.setCurrentText(self.timer.service_ref.getServiceName())
+			self.timerentry_service_ref = ServiceReference(args[0])
+			self.timerentry_service.setCurrentText(self.timerentry_service_ref.getServiceName())
 			self["config"].invalidate(self.channelEntry)
 
 	def getTimestamp(self, date, mytime):
@@ -252,7 +253,8 @@ class TimerEntry(Screen, ConfigListScreen):
 		self.timer.justplay = self.timerentry_justplay.value == "zap"
 		self.timer.resetRepeated()
 		self.timer.afterEvent = {"nothing": AFTEREVENT.NONE, "deepstandby": AFTEREVENT.DEEPSTANDBY, "standby": AFTEREVENT.STANDBY}[self.timerentry_afterevent.value]
-		
+		self.timer.service_ref = self.timerentry_service_ref
+
 		if self.timerentry_type.value == "once":
 			self.timer.begin, self.timer.end = self.getBeginEnd()
 		if self.timerentry_type.value == "repeated":
@@ -343,7 +345,10 @@ class TimerLog(Screen):
 		}, -1)
 
 	def deleteEntry(self):
-		self.log_entries.remove(self["loglist"].getCurrent()[1])
+		cur = self["loglist"].getCurrent()
+		if cur is None:
+			return 
+		self.log_entries.remove(cur[1])
 		self.fillLogList()
 		self["loglist"].l.setList(self.list)
 		self.updateText()