X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FStandby.py;h=1a7ebbd1ae61b09fa7c5716cae28fe5475ad7884;hp=b8ccb6c2e219d9644e9f8e8a46adb0ce06ef8f29;hb=0a62b65175152c42976d4cb04fb7026d9f910915;hpb=29c3340e877cfa1d1818a140f76f14270b84c3d2

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index b8ccb6c..1a7ebbd 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,30 +64,27 @@ class Standby(Screen):
 			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
-		self.session.screen["Standby"].boolean = False
+	def createSummary(self):
+		return StandbySummary
 
 class StandbySummary(Screen):
 	skin = """