X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84702da5d3a6df33717b399b859008a3cf8a1522..9f8ba87f60249139f18f10ab4ba84b187a97da33:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 7c335f1d..2bae4296 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -408,8 +408,8 @@ class InfoBarEPG:
 			self.eventView = None
 		if ret:
 			dlgs=len(self.dlg_stack)
-			assert dlgs>0
-			self.dlg_stack[dlgs-1].close(dlgs > 1)
+			if dlgs > 0:
+				self.dlg_stack[dlgs-1].close(dlgs > 1)
 
 	def openMultiServiceEPG(self, withCallback=True):
 		bouquets = self.servicelist.getBouquetList()
@@ -1015,20 +1015,24 @@ class InfoBarExtensions:
 			{
 				"extensions": (self.extensions, "Extensions..."),
 			})
-			
+
+	PIPON = 0
+	PIPOFF = 1
+	MOVEPIP = 2
+
 	def extensions(self):
 		list = []
 		if self.pipshown == False:
-			list.append((_("Activate Picture in Picture"), "pipon"))
+			list.append((_("Activate Picture in Picture"), self.PIPON))
 		elif self.pipshown == True:
-			list.append((_("Disable Picture in Picture"), "pipoff"))
-			list.append((_("Move Picture in Picture"), "movepip"))
+			list.append((_("Disable Picture in Picture"), self.PIPOFF))
+			list.append((_("Move Picture in Picture"), self.MOVEPIP))
 		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
 
 	def extensionCallback(self, answer):
 		if answer is not None:
-			if answer[1] == "pipon":
-				self.session.nav.stopService()
+			if answer[1] == self.PIPON:
+#				self.session.nav.stopService()
 				self.pip = self.session.instantiateDialog(PictureInPicture)
 				#self.pip.show()
 				
@@ -1041,12 +1045,12 @@ class InfoBarExtensions:
 					self.pipservice = None
 					del self.pip
 				self.session.nav.playService(newservice)
-			elif answer[1] == "pipoff":
+			elif answer[1] == self.PIPOFF:
 				#self.pip.hide()
 				self.pipservice = None
 				del self.pip
 				self.pipshown = False
-			elif answer[1] == "movepip":
+			elif answer[1] == self.MOVEPIP:
 				self.session.open(PiPSetup, pip = self.pip)
 
 from RecordTimer import parseEvent
@@ -1221,6 +1225,7 @@ class InfoBarAudioSelection:
 	def audioSelected(self, audio):
 		if audio is not None:
 			self.audio.selectTrack(audio[1])
+		del self.audio
 
 class InfoBarSubserviceSelection:
 	def __init__(self):
@@ -1360,9 +1365,9 @@ class InfoBarNotifications:
 			print "open",n
 			cb = n[0]
 			if cb is not None:
-				self.session.openWithCallback(cb, *n[1:])
+				self.session.openWithCallback(cb, n[1], *n[2], **n[3])
 			else:
-				self.session.open(*n[1:])
+				self.session.open(n[1], *n[2], **n[3])
 
 class InfoBarServiceNotifications:
 	def __init__(self):