X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/72f38fa3d54ce2ded1826e18e9a3ae94b7bc20f3..ac2878879847f965225e0f72c22ad17b513c16e6:/lib/python/Screens/Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index c598b545..94a56ee4 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -3,6 +3,7 @@ from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
 from Components.SystemInfo import SystemInfo
+from GlobalActions import globalActionMap
 from enigma import eDVBVolumecontrol
 
 inStandby = None
@@ -15,8 +16,6 @@ class Standby(Screen):
 		#restart last played service
 		#unmute adc
 		self.leaveMute()
-		#set brightness of lcd
-		config.lcd.bright.apply()
 		#kill me
 		self.close(True)
 
@@ -43,6 +42,8 @@ class Standby(Screen):
 			"power": self.Power
 		}, -1)
 
+		globalActionMap.setEnabled(False)
+
 		#mute adc
 		self.setMute()
 
@@ -63,8 +64,6 @@ class Standby(Screen):
 			self.avswitch.setInput("SCART")
 		else:
 			self.avswitch.setInput("AUX")
-		#set lcd brightness to standby value
-		config.lcd.standby.apply()
 		self.onFirstExecBegin.append(self.__onFirstExecBegin)
 		self.onClose.append(self.__onClose)
 
@@ -76,6 +75,7 @@ class Standby(Screen):
 		elif self.paused_service:
 			self.paused_service.unPauseService()
 		self.session.screen["Standby"].boolean = False
+		globalActionMap.setEnabled(True)
 
 	def __onFirstExecBegin(self):
 		global inStandby
@@ -160,14 +160,9 @@ class TryQuitMainloop(MessageBox):
 			self.conntected=False
 			self.session.nav.record_event.remove(self.getRecordEvent)
 		if value:
-			# 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)
+			quitMainloop(self.retval)
+		else:
+			MessageBox.close(self, True)
 
 	def __onShow(self):
 		global inTryQuitMainloop