diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-24 09:57:14 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-24 09:57:14 +0100 |
| commit | 74837aa1b9a2d0ee3cd630b74abcb224272290ab (patch) | |
| tree | 2b2436ce64af4b42a23af91eeda3000616bb73d9 /lib/python/Plugins/Extensions | |
| parent | 60fc8afd61923e8bbf949d04b73491862390b65f (diff) | |
| download | enigma2-74837aa1b9a2d0ee3cd630b74abcb224272290ab.tar.gz enigma2-74837aa1b9a2d0ee3cd630b74abcb224272290ab.zip | |
re-introduce consistent EXIT key behaviour. sort "quit" entry to the top though.
Diffstat (limited to 'lib/python/Plugins/Extensions')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 593d4d2e..b7d66a82 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -489,7 +489,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.doShow() def askLeavePlayer(self): - choices = [(_("Continue playing"), "play"), (_("Exit"), "exit")] + choices = [(_("Exit"), "exit"), (_("Continue playing"), "play")] if not self.physicalDVD: choices.insert(1,(_("Return to file browser"), "browser")) self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices) @@ -590,16 +590,19 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP print "cur_dlg", self.session.current_dialog def exitCB(self, answer): - if not answer or answer and answer[1] == "exit": - if self.service: - self.service = None - self.close() - if answer and answer[1] == "browser": + if answer is not None: + if answer[1] == "exit": + if self.service: + self.service = None + self.close() + if answer[1] == "browser": #TODO check here if a paused dvd playback is already running... then re-start it... #else - if self.service: - self.service = None - self.showFileBrowser() + if self.service: + self.service = None + self.showFileBrowser() + else: + pass def __onClose(self): for i in (("/proc/stb/video/aspect", self.old_aspect), ("/proc/stb/video/policy", self.old_policy), ("/proc/stb/denc/0/wss", self.old_wss)): |