X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;fp=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=d1c6c84c9c694ee0077507ab5db69e7ae2b8c890;hp=0b01bf8e5d8381b6abe2434dbe6676bc94945050;hb=439941c4d23e8384ea334d599b42b338beb7ebd5;hpb=fd083bfb31afb60181b9b6f18e585af1e9e5a3f6

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 0b01bf8..d1c6c84 100755
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -235,7 +235,7 @@ class InfoBarNumberZap:
 			else:
 				self.servicelist.recallPrevService()
 		else:
-			if self.has_key("TimeshiftActions") and not self.timeshift_enabled:
+			if not (self.has_key("TimeshiftActions") and self.timeshift_enabled):
 				self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
 	def numberEntered(self, retval):
@@ -1185,11 +1185,12 @@ class InfoBarShowMovies:
 
 class InfoBarTimeshift:
 	def __init__(self):
-		self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
-			{
-				"timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
-				"timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
-			}, prio=1)
+		if SystemInfo["PVRSupport"]:
+			self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
+				{
+					"timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
+					"timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
+				}, prio=1)
 		self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
 			{
 				"timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
@@ -1520,10 +1521,11 @@ class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to
 	start/stop instant records"""
 	def __init__(self):
-		self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
-			{
-				"instantRecord": (self.instantRecord, _("Instant Record...")),
-			})
+		if SystemInfo["PVRSupport"]:
+			self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
+				{
+					"instantRecord": (self.instantRecord, _("Instant Record...")),
+				})
 		self.recording = []
 
 	def stopCurrentRecording(self, entry = -1):