diff options
| author | Mladen Horvat <acidburn@opendreambox.org> | 2009-09-25 15:01:42 +0000 |
|---|---|---|
| committer | Mladen Horvat <acidburn@opendreambox.org> | 2009-09-25 15:01:42 +0000 |
| commit | eafe6abdba24ab9f4336baf0eb9940981e2969b1 (patch) | |
| tree | c1320c1444ed81c1b4950d59be50fed9216923c2 /lib/python/Screens | |
| parent | a6db6ed10bd1e49fc009554d7a5db2f573491736 (diff) | |
| parent | 71fbd4b3c1e7937f2fdc3d903cfd570bcb4cbd5a (diff) | |
| download | enigma2-eafe6abdba24ab9f4336baf0eb9940981e2969b1.tar.gz enigma2-eafe6abdba24ab9f4336baf0eb9940981e2969b1.zip | |
Merge branch 'master' of /git/enigma2
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/Standby.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index b8ccb6c2..c598b545 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -65,28 +65,26 @@ class Standby(Screen): 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 - 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 = """ |