зеркало из https://github.com/mozilla/gecko-dev.git
Fixing a crash when you clicked outside the popup.
This commit is contained in:
Родитель
4e1bd61ea3
Коммит
b524a37773
|
@ -402,25 +402,20 @@ nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
|
||||||
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD,
|
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD,
|
||||||
mX, mY, 0, pWnd, NULL);
|
mX, mY, 0, pWnd, NULL);
|
||||||
|
|
||||||
// Dispatch to MenuItemSelected
|
if (identifier > 0) {
|
||||||
nsIContextMenu * menu;
|
// Dispatch to MenuItemSelected
|
||||||
QueryInterface(kIContextMenuIID, (void**) &menu);
|
nsIContextMenu * menu;
|
||||||
nsIMenuItem * menuItem = FindMenuItem(menu, identifier);
|
QueryInterface(kIContextMenuIID, (void**) &menu);
|
||||||
NS_RELEASE(menu);
|
nsIMenuItem * menuItem = FindMenuItem(menu, identifier);
|
||||||
if (menuItem) {
|
NS_RELEASE(menu);
|
||||||
nsIMenuListener * listener;
|
if (menuItem) {
|
||||||
if (NS_OK == menuItem->QueryInterface(kIMenuListenerIID, (void **)&listener)) {
|
nsIMenuListener * listener;
|
||||||
listener->MenuItemSelected(aMenuEvent);
|
if (NS_OK == menuItem->QueryInterface(kIMenuListenerIID, (void **)&listener)) {
|
||||||
NS_RELEASE(listener);
|
listener->MenuItemSelected(aMenuEvent);
|
||||||
|
NS_RELEASE(listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
if (nsnull != mListener) {
|
|
||||||
NS_ASSERTION(false, "get debugger");
|
|
||||||
mListener->MenuSelected(aMenuEvent);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
return nsEventStatus_eIgnore;
|
return nsEventStatus_eIgnore;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче