Merge pull request xbmc#24543 from enen92/python_context

[ContextMenus] Don't populate python context items if browsing sub-menus

Author: enen92

xbmc/ContextMenuItem.cpp

@@ -47,6 +47,11 @@ bool CContextMenuItem::IsGroup() const
   return !m_groupId.empty();
 }
 
+bool CContextMenuItem::HasParent() const
+{
+  return !m_parent.empty();
+}
+
 bool CContextMenuItem::Execute(const std::shared_ptr<CFileItem>& item) const
 {
   if (!item || m_library.empty() || IsGroup())

xbmc/ContextMenuItem.h

@@ -33,6 +33,7 @@ class IContextMenuItem
   virtual bool Execute(const std::shared_ptr<CFileItem>& item) const = 0;
   virtual std::string GetLabel(const CFileItem& item) const = 0;
   virtual bool IsGroup() const { return false; }
+  virtual bool HasParent() const { return false; }
 };
 
 
@@ -56,6 +57,7 @@ class CContextMenuItem : public IContextMenuItem
   bool IsVisible(const CFileItem& item) const override ;
   bool IsParentOf(const CContextMenuItem& menuItem) const;
   bool IsGroup() const override ;
+  bool HasParent() const override;
   bool Execute(const std::shared_ptr<CFileItem>& item) const override;
   bool operator==(const CContextMenuItem& other) const;
   std::string ToString() const;

xbmc/ContextMenuManager.cpp

@@ -298,6 +298,8 @@ bool CONTEXTMENU::ShowFor(const std::shared_ptr<CFileItem>& fileItem, const CCon
 
   CContextButtons buttons;
   // compute fileitem property-based contextmenu items
+  // unless we're browsing a child menu item
+  if (!root.HasParent())
   {
     int i = 0;
     while (fileItem->HasProperty(StringUtils::Format("contextmenulabel({})", i)))