changed: Remove the "info" and "more" options on the resume menu - they are confusing...

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33866 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/GUIWindowVideoBase.cpp b/xbmc/GUIWindowVideoBase.cpp
index 7c30e66..11d5573 100644 (file)
--- a/xbmc/GUIWindowVideoBase.cpp
+++ b/xbmc/GUIWindowVideoBase.cpp
@@ -1006,10 +1006,19 @@ bool CGUIWindowVideoBase::OnResumeItem(int iItem)
   if (!item->m_bIsFolder)
   {
     CStdString resumeString = GetResumeString(*item);
-    return OnFileAction(iItem, !resumeString.IsEmpty() ? SELECT_ACTION_CHOOSE : SELECT_ACTION_PLAY);
+    if (!resumeString.IsEmpty())
+    {
+      CContextButtons choices;
+      choices.Add(SELECT_ACTION_RESUME, resumeString);
+      choices.Add(SELECT_ACTION_PLAY, 12021);   // Start from beginning
+      int value = CGUIDialogContextMenu::ShowAndGetChoice(choices);
+      if (value < 0)
+        return true;
+      return OnFileAction(iItem, value);
+    }
   }
-  
-  return true;
+
+  return OnFileAction(iItem, SELECT_ACTION_PLAY);
 }
 
 void CGUIWindowVideoBase::OnStreamDetails(const CStreamDetails &details, const CStdString &strFileName, long lFileId)