diff options
author | emveepee <nospam> | 2022-12-11 17:41:52 -0500 |
---|---|---|
committer | emveepee <nospam> | 2022-12-11 17:41:52 -0500 |
commit | 3cf5868666d3dab2811445147c6c76d1c674176c (patch) | |
tree | 62dc97d634323138c6fd5a694a355c19c9b2a0c8 | |
parent | 911ad268d07049f6dc08fd2bbd7feae60c6fb6e8 (diff) |
[PVR] Fix for duplicate resume dialogs
Nexus backport of PR 22241
-rw-r--r-- | xbmc/interfaces/builtins/PlayerBuiltins.cpp | 1 | ||||
-rw-r--r-- | xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xbmc/interfaces/builtins/PlayerBuiltins.cpp b/xbmc/interfaces/builtins/PlayerBuiltins.cpp index 677f4c8b8b..8620d988b2 100644 --- a/xbmc/interfaces/builtins/PlayerBuiltins.cpp +++ b/xbmc/interfaces/builtins/PlayerBuiltins.cpp @@ -506,6 +506,7 @@ int PlayOrQueueMedia(const std::vector<std::string>& params, bool forcePlay) { if (CGUIWindowVideoBase::ShowResumeMenu(item) == false) return false; + item.SetProperty("check_resume", false); } if (item.m_bIsFolder || item.IsPlayList()) diff --git a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp index ee76b95743..66fdb80214 100644 --- a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp @@ -462,7 +462,10 @@ bool CPVRGUIActionsPlayback::PlayMedia(const CFileItem& item) const const std::shared_ptr<CPVRRecording> recording = CServiceBroker::GetPVRManager().Recordings()->GetByPath(item.GetPath()); if (recording) + { pvrItem = std::make_unique<CFileItem>(recording); + pvrItem->SetStartOffset(item.GetStartOffset()); + } } bool bCheckResume = true; if (item.HasProperty("check_resume")) |