From bcf5de9efc34f5947e433add492e4100625061af Mon Sep 17 00:00:00 2001
From: David Quintana <gigaherz@gmail.com>
Date: Mon, 23 Jun 2014 17:50:11 +0000
Subject: [PATCH] [RSHELL] * Notify the focus manager that we are about to open
 a context menu, so that it doesn't mess with the menu popup.

svn path=/branches/shell-experiments/; revision=63634
---
 base/shell/rshell/CMenuBand.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base/shell/rshell/CMenuBand.cpp b/base/shell/rshell/CMenuBand.cpp
index 229cb1ef8e4..88a53d489eb 100644
--- a/base/shell/rshell/CMenuBand.cpp
+++ b/base/shell/rshell/CMenuBand.cpp
@@ -762,9 +762,13 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y)
 
     HWND hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow;
 
+    m_focusManager->PushTrackedPopup(popup);
+
     TRACE("Before Tracking\n");
     uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, hwnd, NULL);
 
+    m_focusManager->PopTrackedPopup(popup);
+
     if (uCommand != 0)
     {
         TRACE("Before InvokeCommand\n");