X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5b3739ccccddb795ca7e75e60f202cbce5c78144..29eeffa0512e1ea22f1bbb2ae486c58e2e529ff6:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index bfeb394b..2f830616 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1370,11 +1370,18 @@ class InfoBarSleepTimer:
 # depends on InfoBarExtensions
 class InfoBarPiP:
 	def __init__(self):
-		self.session.pipshown = False
+		try:
+			self.session.pipshown
+		except:
+			self.session.pipshown = False
 		if SystemInfo.get("NumVideoDecoders", 1) > 1:
-			self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue")
-			self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
-			self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+			if (self.allowPiP):
+				self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue")
+				self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
+				self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+			else:
+				self.addExtension((self.getShowHideName, self.showPiP, self.pipShown), "blue")
+				self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
 
 	def pipShown(self):
 		return self.session.pipshown
@@ -1603,21 +1610,21 @@ class InfoBarInstantRecord:
 		if self.isInstantRecordRunning():
 			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
 				title=_("A recording is currently running.\nWhat do you want to do?"), \
-				list=((_("add recording (stop after current event)"), "event"), \
+				list=((_("stop recording"), "stop"), \
+				(_("add recording (stop after current event)"), "event"), \
+				(_("add recording (indefinitely)"), "indefinitely"), \
 				(_("add recording (enter recording duration)"), "manualduration"), \
 				(_("add recording (enter recording endtime)"), "manualendtime"), \
-				(_("add recording (indefinitely)"), "indefinitely"), \
 				(_("change recording (duration)"), "changeduration"), \
 				(_("change recording (endtime)"), "changeendtime"), \
-				(_("stop recording"), "stop"), \
 				(_("do nothing"), "no")))
 		else:
 			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
 				title=_("Start recording?"), \
 				list=((_("add recording (stop after current event)"), "event"), \
+				(_("add recording (indefinitely)"), "indefinitely"), \
 				(_("add recording (enter recording duration)"), "manualduration"), \
 				(_("add recording (enter recording endtime)"), "manualendtime"), \
-				(_("add recording (indefinitely)"), "indefinitely"), \
 				(_("don't record"), "no")))
 
 from Tools.ISO639 import LanguageCodes