X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/45cc9a317c299b699756778a64eb3414e2b6bacb..d2e6f12364527def4672a566323654758d8f3d19:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index f2e01703..781e8bf1 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -203,9 +203,14 @@ class TimerEntry(Screen):
 			self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from"))
 
 	def finishedChannelSelection(self, args):
-		self.timer.service_ref = ServiceReference(args)
-		config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),)
-		self["config"].invalidate(config.timerentry.service)
+		oldref = self.timer.service_ref
+		try:
+			self.timer.service_ref = ServiceReference(args)
+			config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),)
+			self["config"].invalidate(config.timerentry.service)
+		except:
+			print "you pressed cancel"
+			self.timer.service_ref = oldref
 
 	def keyNumberGlobal(self, number):
 		print "You pressed number " + str(number)
@@ -219,6 +224,7 @@ class TimerEntry(Screen):
 		return int(mktime(dt.timetuple()))
 
 	def keyGo(self):
+		self.timer.description = config.timerentry.description.value
 		self.timer.resetRepeated()
 		
 		if (config.timerentry.type.value == 0): # once