X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/99c296ce8c61a4393dae09fd78ae54b4510ec6fd..5b37109a8002420247a5abf46841c95365e88036:/lib/python/Plugins/Extensions/DVDPlayer/plugin.py

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index cb5f0e0d..40feaffe 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -352,7 +352,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 						if file.mimetype == "video/x-dvd":
 							self.dvd_device = devicepath
 							print "physical dvd found:", self.dvd_device
-							self.physicalDVD = True			
+							self.physicalDVD = True
 
 		self.dvd_filelist = dvd_filelist
 		self.onFirstExecBegin.append(self.showFileBrowser)
@@ -387,9 +387,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 
 	def serviceStarted(self): #override InfoBarShowHide function
 		self.dvdScreen.show()
-		subs = self.getServiceInterface("subtitle")
-		if subs:
-			subs.enableSubtitles(self.dvdScreen.instance, None)
 
 	def doEofInternal(self, playing):
 		if self.in_menu:
@@ -489,9 +486,9 @@ 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"))			
+			choices.insert(1,(_("Return to file browser"), "browser"))
 		self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices)
 
 	def sendKey(self, key):
@@ -588,6 +585,9 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 				self.service = self.session.nav.getCurrentService()
 				print "self.service", self.service
 				print "cur_dlg", self.session.current_dialog
+				subs = self.getServiceInterface("subtitle")
+				if subs:
+					subs.enableSubtitles(self.dvdScreen.instance, None)
 
 	def exitCB(self, answer):
 		if answer is not None: