From dde54af22cfbb6ab7ae44d457642026b6900d435 Mon Sep 17 00:00:00 2001 From: Sam Stenvall Date: Wed, 28 Jan 2015 15:54:20 +0200 Subject: [PATCH] [gui] remove any set context buttons for the "go to parent" item (fixes #15732) --- xbmc/windows/GUIMediaWindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index c8ccc85dfc3eb..28f6f21c507f3 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -1523,8 +1523,12 @@ void CGUIMediaWindow::GetContextButtons(int itemNumber, CContextButtons &buttons { CFileItemPtr item = (itemNumber >= 0 && itemNumber < m_vecItems->Size()) ? m_vecItems->Get(itemNumber) : CFileItemPtr(); - if (!item) + // ensure that the "go to parent" item doesn't have any context menu items + if (!item || item->IsParentFolder()) + { + buttons.clear(); return; + } // user added buttons std::string label;