X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0ed316183c8e61330cff1c01e095804bc6012809..bfa525d0451df77a28db6ce21ec45f00b89661a8:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index da38da04..9b3c5cf4 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -863,22 +863,26 @@ class InfoBarPVRState:
 	def __init__(self, screen=PVRState):
 		self.onPlayStateChanged.append(self.__playStateChanged)
 		self.pvrStateDialog = self.session.instantiateDialog(screen)
-		self.onShow.append(self.__mayShow)
+		self.onShow.append(self._mayShow)
 		self.onHide.append(self.pvrStateDialog.hide)
-	
-	def __mayShow(self):
-		if self.seekstate != self.SEEK_STATE_PLAY and self.execing:
+
+	def _mayShow(self):
+		if self.execing and self.seekstate != self.SEEK_STATE_PLAY:
 			self.pvrStateDialog.show()
 
 	def __playStateChanged(self, state):
 		playstateString = state[3]
 		self.pvrStateDialog["state"].setText(playstateString)
-		self.__mayShow()
+		self._mayShow()
 
 class InfoBarTimeshiftState(InfoBarPVRState):
 	def __init__(self):
 		InfoBarPVRState.__init__(self, screen=TimeshiftState)
 
+	def _mayShow(self):
+		if self.execing and self.timeshift_enabled:
+			self.pvrStateDialog.show()
+
 class InfoBarShowMovies:
 
 	# i don't really like this class. 
@@ -1321,7 +1325,7 @@ class InfoBarInstantRecord:
 	def inputCallback(self, value):
 		if value is not None:
 			print "stopping recording after", int(value), "minutes."
-			self.recording[self.selectedEntry].end = time.time() + 60 * int(value)
+			self.recording[self.selectedEntry].end = time() + 60 * int(value)
 			self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
 	def instantRecord(self):
@@ -1891,12 +1895,12 @@ class InfoBarServiceErrorPopupSupport:
 			eDVBServicePMTHandler.eventSOF: None,
 			eDVBServicePMTHandler.eventEOF: None
 		}
-		
+
 		if error not in errors:
 			error = None
 
-		error = error and errors[error]
-		
+		error = error is not None and errors[error]
+
 		if error is not None:
 			Notifications.AddPopup(text = error, type = MessageBox.TYPE_ERROR, timeout = 5, id = "ZapError")
 		else: