X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEntry.py;h=3308b81790098d9a278663ae54afcddfe540f3cc;hp=9885e700b05c01181448aab09e3b0ee4ba194212;hb=83b8f1c6f9357e41c34020251038b0cdeab76cb7;hpb=31ac4a233ddcb341e49f63f964d4d35fd2097a9c

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 9885e70..3308b81 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -94,7 +94,12 @@ class TimerEntry(Screen, ConfigListScreen):
 				weekday = (int(strftime("%w", localtime(self.timer.begin))) - 1) % 7
 				day[weekday] = 1
 
-			self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
+			timer_choices = [("zap", _("zap"))]
+			default = "zap"
+			if SystemInfo["PVRSupport"]:
+				timer_choices.append(("record", _("record")))
+				default = {0: "record", 1: "zap"}[justplay]
+			self.timerentry_justplay = ConfigSelection(choices = timer_choices, default = default)
 			if SystemInfo["DeepstandbySupport"]:
 				shutdownString = _("go to deep standby")
 			else:
@@ -133,6 +138,8 @@ class TimerEntry(Screen, ConfigListScreen):
 				servicename = str(self.timer.service_ref.getServiceName())
 			except:
 				pass
+			if not servicename:
+				servicename = "N/A"
 			self.timerentry_service_ref = self.timer.service_ref
 			self.timerentry_service = ConfigSelection([servicename])