Merge pull request #284 from MediaPortal/MP1-5203-Resume_of_inserted_…

…dvd_bluray_disc_doesn't_work MP1-5203: Resume of inserted dvd/bluray disc doesn't work (from autoplay)
MediaPortal · Mar 18, 2024 · 9085a12 · 9085a12
2 parents f8ac9f3 + ff121f2
commit 9085a12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mediaportal/WindowPlugins/Common.GUIPlugins/Video/SelectBDHandler.cs b/mediaportal/WindowPlugins/Common.GUIPlugins/Video/SelectBDHandler.cs
@@ -154,7 +154,8 @@ public bool OnPlayBD(String drive, int parentId)
           byte[] resumeData = null;
 
           if ((idMovieImg >= 0) && (idFileImg >= 0))
-          {
+          {
+            g_Player.SetResumeBDTitleState = VideoDatabase.GetTitleBDId(idFileImg, out resumeData);
             timeMovieStopped = VideoDatabase.GetMovieStopTimeAndResumeData(idFileImg, out resumeData, g_Player.SetResumeBDTitleState);
 
             if (timeMovieStopped > 0)
@@ -184,8 +185,12 @@ public bool OnPlayBD(String drive, int parentId)
           {
             g_Player.Stop();
           }
+
+          if (timeMovieStopped > 0)
+            g_Player.Play(drive + @"\BDMV\index.bdmv", g_Player.MediaType.Video, g_Player.SetResumeBDTitleState, true);
+          else
+            g_Player.PlayBD(drive + @"\BDMV\index.bdmv");
 
-          g_Player.PlayBD(drive + @"\BDMV\index.bdmv");
           g_Player.ShowFullScreenWindow();
 
           ///*

diff --git a/mediaportal/WindowPlugins/GUIVideos/SelectDVDHandler.cs b/mediaportal/WindowPlugins/GUIVideos/SelectDVDHandler.cs
@@ -157,7 +157,7 @@ public bool OnPlayDVD(String drive, int parentId)
           byte[] resumeData = null;
           if ((idMovie >= 0) && (idFile >= 0))
           {
-            timeMovieStopped = VideoDatabase.GetMovieStopTimeAndResumeData(idFile, out resumeData, g_Player.SetResumeBDTitleState);
+            timeMovieStopped = VideoDatabase.GetMovieStopTimeAndResumeData(idFile, out resumeData);
             //Log.Info("GUIVideoFiles: OnPlayBackStopped for DVD - idFile={0} timeMovieStopped={1} resumeData={2}", idFile, timeMovieStopped, resumeData);
             if (timeMovieStopped > 0)
             {