X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8dc8d726907ae29ad9c9d89d28faeccfb682e906..a4b8930b43f39148f93858516972842e1896d062:/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 32e35933..ce5fa9d2 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -166,7 +166,7 @@ class ChapterZap(Screen):
 		self.Timer.start(3000, True)
 
 class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport):
-#	ALLOW_SUSPEND = True
+	ALLOW_SUSPEND = Screen.SUSPEND_PAUSES
 	ENABLE_RESUME_SUPPORT = True
 	
 	skin = """
@@ -349,6 +349,8 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 		hotplugNotifier.append(self.hotplugCB)
 		
+		self.autoplay = dvd_device or dvd_filelist
+
 		if dvd_device:
 			self.physicalDVD = True
 		else:
@@ -575,9 +577,11 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		self.askLeavePlayer()
 
 	def opened(self):
-		if len(self.dvd_filelist) == 1:
+		if self.autoplay and self.dvd_filelist:
 			# opened via autoplay
 			self.FileBrowserClosed(self.dvd_filelist[0])
+		elif self.autoplay and self.physicalDVD:
+			self.playPhysicalCB(True)
 		elif self.physicalDVD:
 			# opened from menu with dvd in drive
 			self.session.openWithCallback(self.playPhysicalCB, MessageBox, text=_("Do you want to play DVD in drive?"), timeout=5 )