Merge pull request xbmc#671 from cptspiff/closecontext

changed: close context menu when hosting media window closes
wboubi · Feb 7, 2012 · 68e82e4 · 68e82e4
2 parents 7252914 + 04ff814
commit 68e82e4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -217,6 +217,10 @@ bool CGUIMediaWindow::OnMessage(CGUIMessage& message)
       m_iSelectedItem = m_viewControl.GetSelectedItem();
       m_iLastControl = GetFocusedControlID();
       CGUIWindow::OnMessage(message);
+      CGUIDialogContextMenu* pDlg = (CGUIDialogContextMenu*)g_windowManager.GetWindow(WINDOW_DIALOG_CONTEXT_MENU);
+      if (pDlg && pDlg->IsActive())
+        pDlg->Close();
+
       // Call ClearFileItems() after our window has finished doing any WindowClose
       // animations
       ClearFileItems();