github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trop-bot-2-0-x-bp-fix--tray-setcontextmenu-crash-1530308984992' into 2-0-x

Browse Source
This commit is contained in:
John Kleinschmidt
2018-07-02 14:10:14 -04:00
parent a253323ea1 3ab99663eb
commit d06c20f836
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@@ -544,7 +544,6 @@ jobs:
TARGET_ARCH: x64
macos:
xcode: "9.0"
resource_class: xlarge
steps:
- checkout
- run:
@@ -643,7 +642,6 @@ jobs:
MAS_BUILD: 1
macos:
xcode: "9.0"
resource_class: xlarge
steps:
- checkout
- run:

4
atom/browser/ui/cocoa/atom_menu_controller.mm
View File

@@ -123,7 +123,9 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
[menu_ cancelTracking];
isMenuOpen_ = NO;
model_->MenuWillClose();
closeCallback.Run();
if (!closeCallback.is_null()) {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
}
}
}