diff options
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp | 5 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/VideoPlayer.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp index 3ea1fdd246..aee1ac0ece 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp @@ -140,6 +140,7 @@ bool CDVDInputStreamBluray::Open() bool openStream = false; bool openDisc = false; + bool resumable = true; // The item was selected via the simple menu if (URIUtils::IsProtocol(strPath, "bluray")) @@ -161,6 +162,7 @@ bool CDVDInputStreamBluray::Open() const std::string& root2 = url2.GetHostName(); CURL url(root2); CFileItem item(url, false); + resumable = false; // Check whether disc is AACS protected if (!openDisc) @@ -325,7 +327,8 @@ bool CDVDInputStreamBluray::Open() m_navmode = false; m_titleInfo = GetTitleFile(filename); } - else if (mode == BD_PLAYBACK_MAIN_TITLE) + else if (mode == BD_PLAYBACK_MAIN_TITLE || + (resumable && m_item.m_lStartOffset == STARTOFFSET_RESUME)) { m_navmode = false; m_titleInfo = GetTitleLongest(); diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index ec324b6e9e..3188505dc0 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -4775,7 +4775,7 @@ void CVideoPlayer::UpdatePlayState(double timeout) if (!pMenu->CanSeek()) state.time_offset = 0; } - state.hasMenu = true; + state.hasMenu = pMenu->HasMenu(); } state.canpause = m_pInputStream->CanPause(); |