Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #4063 from Montellese/play_using_resume

videolibrary: add choice to resume video when using "Play using..." (fixes #14358)
  • Loading branch information...
commit 1d2ddb8986948595a00ead984114287e5abdcd0a 2 parents 44dc3dd + 362100d
@jmarshallnz jmarshallnz authored
Showing with 12 additions and 1 deletion.
  1. +12 −1 xbmc/video/windows/GUIWindowVideoBase.cpp
View
13 xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -1371,7 +1371,18 @@ bool CGUIWindowVideoBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
CPlayerCoreFactory::Get().GetPlayers(*item, vecCores);
g_application.m_eForcedNextPlayer = CPlayerCoreFactory::Get().SelectPlayerDialog(vecCores);
if (g_application.m_eForcedNextPlayer != EPC_NONE)
- OnClick(itemNumber);
+ {
+ // any other select actions but play or resume, resume, play or playpart
+ // don't make any sense here since the user already decided that he'd
+ // like to play the item (just with a specific player)
+ VideoSelectAction selectAction = (VideoSelectAction)CSettings::Get().GetInt("myvideos.selectaction");
+ if (selectAction != SELECT_ACTION_PLAY_OR_RESUME &&
+ selectAction != SELECT_ACTION_RESUME &&
+ selectAction != SELECT_ACTION_PLAY &&
+ selectAction != SELECT_ACTION_PLAYPART)
+ selectAction = SELECT_ACTION_PLAY_OR_RESUME;
+ return OnFileAction(itemNumber, selectAction);
+ }
return true;
}
Please sign in to comment.
Something went wrong with that request. Please try again.