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 'master' into roller/chromium/master

Browse Source
This commit is contained in:
Jeremy Rose
2021-03-30 09:47:35 -07:00
committed by GitHub
parent 1f575ca3af c9217f07e6
commit 5d13820441
28 changed files with 226 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/browser/api/electron_api_menu.cc
View File

@@ -264,7 +264,7 @@ void Menu::OnMenuWillClose() {
}
void Menu::OnMenuWillShow() {
Pin(v8::Isolate::GetCurrent());
Pin(JavascriptEnvironment::GetIsolate());
Emit("menu-will-show");
}