mirror of
https://github.com/reactos/reactos.git
synced 2024-08-12 06:06:27 +00:00
[RSHELL]
* Fix stack overflow when pressing enter with a menu item selected. Executing with enter now works correctly. CORE-7586 svn path=/branches/shell-experiments/; revision=62957
This commit is contained in:
parent
663bc1da24
commit
cfb6a8a36e
|
@ -816,13 +816,6 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theRe
|
||||||
|
|
||||||
INT iItem = (INT)wParam;
|
INT iItem = (INT)wParam;
|
||||||
|
|
||||||
return ExecuteItem(iItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
|
|
||||||
{
|
|
||||||
m_menuBand->_KillPopupTimers();
|
|
||||||
|
|
||||||
if (PopupItem(iItem) == S_OK)
|
if (PopupItem(iItem) == S_OK)
|
||||||
{
|
{
|
||||||
TRACE("PopupItem returned S_OK\n");
|
TRACE("PopupItem returned S_OK\n");
|
||||||
|
@ -831,10 +824,12 @@ HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
|
||||||
|
|
||||||
TRACE("Executing...\n");
|
TRACE("Executing...\n");
|
||||||
|
|
||||||
HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
|
return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
|
||||||
|
}
|
||||||
|
|
||||||
if (FAILED_UNEXPECTEDLY(hr))
|
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
|
||||||
return hr;
|
{
|
||||||
|
m_menuBand->_KillPopupTimers();
|
||||||
|
|
||||||
INT index;
|
INT index;
|
||||||
DWORD_PTR data;
|
DWORD_PTR data;
|
||||||
|
|
Loading…
Reference in a new issue