Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 24 Nov 2008 08:58:05 +0000 (09:58 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 24 Nov 2008 08:58:05 +0000 (09:58 +0100)
lib/python/Plugins/Extensions/DVDPlayer/plugin.py

index 593d4d2..b7d66a8 100644 (file)
@@ -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)):