Merge pull request xbmc#6290 from Jalle19/fix-15732

mkortstiege · Feb 19, 2015 · 0c6eadc · 0c6eadc
2 parents 35b7ab3 + 96b9982
commit 0c6eadc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
@@ -328,7 +328,7 @@ bool CGUIWindowPVRRecordings::ActionDeleteRecording(CFileItem *item)
 {
   bool bReturn = false;
 
-  if (!item->IsPVRRecording() && !item->m_bIsFolder)
+  if (!item->IsPVRRecording() && !item->m_bIsFolder || item->IsParentFolder())
     return bReturn;
 
   /* show a confirmation dialog */

diff --git 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;