X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bb2800462a81afbcfce36fa15d90808d13eae55b..269c1d980e92fa79d72c19b0a51db16240b2649d:/lib/python/Screens/Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 4a9dca40..b8ccb6c2 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -46,16 +46,18 @@ class Standby(Screen):
 		#mute adc
 		self.setMute()
 
-		if self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_STOPS:
-			#get currently playing service reference
-			self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
-			#stop actual played dvb-service
-			self.session.nav.stopService()
-			self.paused_service = None
-		elif self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_PAUSES:
-			self.paused_service = self.session.current_dialog
-			self.paused_service.pauseService()
-			self.prev_running_service = None
+		self.paused_service = None
+		self.prev_running_service = None
+		if self.session.current_dialog:
+			if self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_STOPS:
+				#get currently playing service reference
+				self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
+				#stop actual played dvb-service
+				self.session.nav.stopService()
+			elif self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_PAUSES:
+				self.paused_service = self.session.current_dialog
+				self.paused_service.pauseService()
+
 		#set input to vcr scart
 		if SystemInfo["ScartSwitch"]:
 			self.avswitch.setInput("SCART")
@@ -160,9 +162,14 @@ class TryQuitMainloop(MessageBox):
 			self.conntected=False
 			self.session.nav.record_event.remove(self.getRecordEvent)
 		if value:
-			quitMainloop(self.retval)
-		else:
-			MessageBox.close(self, True)
+			# hack .. we dont like to show any other screens when this screen has closed
+			self.onClose = [self.__closed]
+			self.session.dialog_stack = []
+			self.session.summary_stack = [None]
+		MessageBox.close(self, True)
+
+	def __closed(self):
+		quitMainloop(self.retval)
 
 	def __onShow(self):
 		global inTryQuitMainloop