[ros-diffs] [dquintana] 62957: [RSHELL] * Fix stack overflow when pressing enter with a menu item selected. Executing with enter now works correctly. CORE-7586

Author: dquintana
Date: Thu Apr 24 16:17:53 2014
New Revision: 62957

URL: http://svn.reactos.org/svn/reactos?rev=62957&view=rev
Log:
[RSHELL]
* Fix stack overflow when pressing enter with a menu item selected. Executing with enter
now works correctly.
CORE-7586

Modified:
    branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp

Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1] Thu Apr 24
16:17:53 2014
@@ -816,13 +816,6 @@
 
     INT iItem = (INT)wParam;
 
-    return ExecuteItem(iItem);
-}
-
-HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
-{
-    m_menuBand->_KillPopupTimers();
-
     if (PopupItem(iItem) == S_OK)
     {
         TRACE("PopupItem returned S_OK\n");
@@ -831,10 +824,12 @@
 
     TRACE("Executing...\n");
 
-    HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
-
-    if (FAILED_UNEXPECTEDLY(hr))
-        return hr;
+    return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
+}
+
+HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
+{
+    m_menuBand->_KillPopupTimers();
 
     INT index;
     DWORD_PTR data;