X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bce53d4a67d1655a496eebe5912c8573e880114e..eedaa114b5af841f0e4442274d4408be98d956ce:/lib/python/Screens/Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index afea94b9..1a7ebbd1 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,37 +42,49 @@ class Standby(Screen):
 			"power": self.Power
 		}, -1)
 
+		globalActionMap.setEnabled(False)
+
 		#mute adc
 		self.setMute()
-		#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
+		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")
 		else:
 			self.avswitch.setInput("AUX")
-		#set lcd brightness to standby value
-		config.lcd.standby.apply()
-		self.onShow.append(self.__onShow)
-		self.onHide.append(self.__onHide)
+		self.onFirstExecBegin.append(self.__onFirstExecBegin)
 		self.onClose.append(self.__onClose)
 
 	def __onClose(self):
+		global inStandby
+		inStandby = None
 		if self.prev_running_service:
 			self.session.nav.playService(self.prev_running_service)
+		elif self.paused_service:
+			self.paused_service.unPauseService()
+		self.session.screen["Standby"].boolean = False
+		globalActionMap.setEnabled(True)
 
-	def createSummary(self):
-		return StandbySummary
-
-	def __onShow(self):
+	def __onFirstExecBegin(self):
 		global inStandby
 		inStandby = self
+		self.session.screen["Standby"].boolean = True
+		config.misc.standbyCounter.value += 1
 
-	def __onHide(self):
-		global inStandby
-		inStandby = None
+	def createSummary(self):
+		return StandbySummary
 
 class StandbySummary(Screen):
 	skin = """
@@ -149,9 +160,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