X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a48f7d385c15cd43a99a74b3712ee7f929ca5b8d..efa41fe76ddfee368009a914bc9b4bff54dee8ce:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9e8e20b6..57194791 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -860,14 +860,15 @@ class InfoBarSeek:
 from Screens.PVRState import PVRState, TimeshiftState
 
 class InfoBarPVRState:
-	def __init__(self, screen=PVRState):
+	def __init__(self, screen=PVRState, show_always=False):
+		self.show_always = show_always
 		self.onPlayStateChanged.append(self.__playStateChanged)
 		self.pvrStateDialog = self.session.instantiateDialog(screen)
 		self.onShow.append(self.__mayShow)
 		self.onHide.append(self.pvrStateDialog.hide)
 	
 	def __mayShow(self):
-		if self.seekstate != self.SEEK_STATE_PLAY and self.execing:
+		if self.execing and (self.show_always or self.seekstate != self.SEEK_STATE_PLAY):
 			self.pvrStateDialog.show()
 
 	def __playStateChanged(self, state):
@@ -877,7 +878,7 @@ class InfoBarPVRState:
 
 class InfoBarTimeshiftState(InfoBarPVRState):
 	def __init__(self):
-		InfoBarPVRState.__init__(self, screen=TimeshiftState)
+		InfoBarPVRState.__init__(self, screen=TimeshiftState, show_always=True)
 
 class InfoBarShowMovies:
 
@@ -1891,12 +1892,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: