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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 57194791..2c2b4a5b 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -227,7 +227,7 @@ class InfoBarNumberZap:
 			bouquetlist = serviceHandler.list(bouquet)
 			if not bouquetlist is None:
 				while number:
-					bouquet = self.servicelist.appendDVBTypes(bouquetlist.getNext())
+					bouquet = bouquetlist.getNext()
 					if not bouquet.valid(): #check end of list
 						break
 					if bouquet.flags & eServiceReference.isDirectory:
@@ -860,25 +860,28 @@ class InfoBarSeek:
 from Screens.PVRState import PVRState, TimeshiftState
 
 class InfoBarPVRState:
-	def __init__(self, screen=PVRState, show_always=False):
-		self.show_always = show_always
+	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.execing and (self.show_always or self.seekstate != self.SEEK_STATE_PLAY):
+
+	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, show_always=True)
+		InfoBarPVRState.__init__(self, screen=TimeshiftState)
+
+	def _mayShow(self):
+		if self.execing and self.timeshift_enabled:
+			self.pvrStateDialog.show()
 
 class InfoBarShowMovies:
 
@@ -1333,9 +1336,21 @@ class InfoBarInstantRecord:
 			return
 
 		if self.isInstantRecordRunning():
-			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, title=_("A recording is currently running.\nWhat do you want to do?"), list=[(_("stop recording"), "stop"), (_("change recording (duration)"), "changeduration"), (_("add recording (indefinitely)"), "indefinitely"), (_("add recording (stop after current event)"), "event"), (_("add recording (enter recording duration)"), "manualduration"), (_("do nothing"), "no")])
+			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
+				title=_("A recording is currently running.\nWhat do you want to do?"), \
+				list=[(_("stop recording"), "stop"), \
+				(_("change recording (duration)"), "changeduration"), \
+				(_("add recording (indefinitely)"), "indefinitely"), \
+				(_("add recording (stop after current event)"), "event"), \
+				(_("add recording (enter recording duration)"), "manualduration"), \
+				(_("do nothing"), "no")])
 		else:
-			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, title=_("Start recording?"), list=[(_("add recording (indefinitely)"), "indefinitely"), (_("add recording (stop after current event)"), "event"), (_("add recording (enter recording duration)"), "manualduration"),(_("don't record"), "no")])
+			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
+				title=_("Start recording?"), \
+				list=[(_("add recording (indefinitely)"), "indefinitely"), \
+				(_("add recording (stop after current event)"), "event"), \
+				(_("add recording (enter recording duration)"), "manualduration"), \
+				(_("don't record"), "no")])
 
 from Tools.ISO639 import LanguageCodes
 
@@ -1893,10 +1908,7 @@ class InfoBarServiceErrorPopupSupport:
 			eDVBServicePMTHandler.eventEOF: None
 		}
 
-		if error not in errors:
-			error = None
-
-		error = error is not None and errors[error]
+		error = errors.get(error) #this returns None when the key not exist in the dict
 
 		if error is not None:
 			Notifications.AddPopup(text = error, type = MessageBox.TYPE_ERROR, timeout = 5, id = "ZapError")