From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Mon, 24 Nov 2008 08:57:14 +0000 (+0100)
Subject: re-introduce consistent EXIT key behaviour. sort "quit" entry to the top though.
X-Git-Tag: 2.6.0~578
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/74837aa1b9a2d0ee3cd630b74abcb224272290ab

re-introduce consistent EXIT key behaviour. sort "quit" entry to the top though.
---

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)):