[RSHELL]
authorDavid Quintana <gigaherz@gmail.com>
Wed, 29 Oct 2014 22:50:27 +0000 (22:50 +0000)
committerDavid Quintana <gigaherz@gmail.com>
Wed, 29 Oct 2014 22:50:27 +0000 (22:50 +0000)
* Hopefully fix the start menu closing randomly. May have side-effects, but I think it's best to be conservative here and prefer the possibility of the menu staying open unexpectedly, rather than closing unexpectedly.

svn path=/branches/shell-experiments/; revision=65114

base/shell/rshell/CMenuDeskBar.cpp

index 673e793..cdbca08 100644 (file)
@@ -501,6 +501,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType)
 
     CComPtr<IMenuPopup> oldParent = m_SubMenuParent;
 
+    TRACE("OnSelect dwSelectType=%d\n", this, dwSelectType);
     switch (dwSelectType)
     {
     case MPOS_EXECUTE:
@@ -705,9 +706,11 @@ LRESULT CMenuDeskBar::_OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 
 LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
+#if 0
     if (wParam == 0 && m_Shown)
     {
         OnSelect(MPOS_FULLCANCEL);
     }
+#endif
     return 0;
 }