github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-06 22:24:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: only call popup closecallback for top-level menu (#49017)

Browse Source
This commit is contained in:
Shelley Vohr
2025-11-21 16:37:46 +01:00
committed by GitHub
parent d890ebd9fa
commit e4f02faa0a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
shell/browser/ui/cocoa/electron_menu_controller.mm
View File

@@ -563,16 +563,22 @@ NSArray* ConvertSharingItemToNS(const SharingItem& item) {
}
- (void)menuDidClose:(NSMenu*)menu {
if (isMenuOpen_) {
isMenuOpen_ = NO;
if (model_)
model_->MenuWillClose();
// Post async task so that itemSelected runs before the close callback
// deletes the controller from the map which deallocates it
if (!closeCallback.is_null()) {
content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE,
std::move(closeCallback));
}
// If the menu is already closed, do nothing.
if (!isMenuOpen_)
return;
// We should only respond to the top-level menu's close event.
if (menu != menu_)
return;
isMenuOpen_ = NO;
if (model_)
model_->MenuWillClose();
// Post async task so that itemSelected runs before the close callback
// deletes the controller from the map which deallocates it
if (!closeCallback.is_null()) {
content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE,
std::move(closeCallback));
}
}