X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5f45eb94454f5787d87725c9d2a73cecc84eda11..aa6c9dd559999a0b0223fbd66cd0f0512ebc0345:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 58c12696..1b743194 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -976,24 +976,26 @@ class InfoBarExtensions:
 		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
 
 	def extensionCallback(self, answer):
-		if answer[1] == "pipon":
-			self.session.nav.stopService()
-			self.pip = self.session.instantiateDialog(PictureInPicture)
-			#self.pip.show()
-			
-			newservice = self.session.nav.getCurrentlyPlayingServiceReference()
-			self.pipservice = eServiceCenter.getInstance().play(newservice)
-			if self.pipservice and not self.pipservice.setTarget(1):
-				self.pipservice.start()
-				self.pipshown = True
-			else:
+		if answer is not None:
+			if answer[1] == "pipon":
+				self.session.nav.stopService()
+				self.pip = self.session.instantiateDialog(PictureInPicture)
+				#self.pip.show()
+				
+				newservice = self.session.nav.getCurrentlyPlayingServiceReference()
+				self.pipservice = eServiceCenter.getInstance().play(newservice)
+				if self.pipservice and not self.pipservice.setTarget(1):
+					self.pipservice.start()
+					self.pipshown = True
+				else:
+					self.pipservice = None
+					del self.pip
+	
+			elif answer[1] == "pipoff":
+				#self.pip.hide()
 				self.pipservice = None
 				del self.pip
-
-		elif answer[1] == "pipoff":
-			#self.pip.hide()
-			del self.pip
-			self.pipshown = False
+				self.pipshown = False
 
 from RecordTimer import parseEvent
 
@@ -1065,11 +1067,16 @@ class InfoBarInstantRecord:
 		return False
 
 	def recordQuestionCallback(self, answer):
+		print "pre:\n", self.recording
+		
 		if answer is None or answer[1] == "no":
 			return
 		list = []
-		for x in self.recording:
-			if x.dontSave:
+		recording = self.recording[:]
+		for x in recording:
+			if not x in self.session.nav.RecordTimer.timer_list:
+				self.recording.remove(x)
+			elif x.dontSave and x.isRunning():
 				list.append(TimerEntryComponent(x, False))		
 
 		if answer[1] == "changeduration":
@@ -1090,6 +1097,8 @@ class InfoBarInstantRecord:
 				self.selectedEntry = len(self.recording)
 				self.session.openWithCallback(self.inputCallback, InputBox, title=_("How many minutes do you want to record?"), text="5", maxSize=False, type=Input.NUMBER)
 			self.startInstantRecording(limitEvent = limitEvent)
+			
+		print "after:\n", self.recording
 
 	def changeDuration(self, entry):
 		if entry is not None:
@@ -1174,9 +1183,9 @@ class InfoBarAdditionalInfo:
 		self.onLayoutFinish.append(self["ButtonYellowText"].update)
 
 		self["ButtonBlue"] = PixmapConditional(withTimer = False)
-		self["ButtonBlue"].setConnect(lambda: True)
+		self["ButtonBlue"].setConnect(lambda: False)
 		self["ButtonBlueText"] = LabelConditional(text = _("Extensions"), withTimer = False)
-		self["ButtonBlueText"].setConnect(lambda: True)
+		self["ButtonBlueText"].setConnect(lambda: False)
 		self.onLayoutFinish.append(self["ButtonBlue"].update)
 		self.onLayoutFinish.append(self["ButtonBlueText"].update)