fix: set default menu in will-finish-launching event (electron#23214)

zcbenz · web-flow · commit cb6a1e2c5e67 · 2020-04-23T10:51:31.000-07:00
diff --git a/lib/browser/init.ts b/lib/browser/init.ts
@@ -207,10 +207,9 @@ const { setDefaultApplicationMenu } = require('@electron/internal/browser/defaul
 
 // Create default menu.
 //
-// Note that the task must be added before loading any app, so we can make sure
-// the call is maded before any user window is created, otherwise the default
-// menu may show even when user explicitly hides the menu.
-app.whenReady().then(setDefaultApplicationMenu);
+// The |will-finish-launching| event is emitted before |ready| event, so default
+// menu is set before any user window is created.
+app.once('will-finish-launching', setDefaultApplicationMenu);
 
 if (packagePath) {
   // Finally load app's main.js and transfer control to C++.
diff --git a/spec-main/fixtures/api/test-menu-visibility/main.js b/spec-main/fixtures/api/test-menu-visibility/main.js
@@ -1,7 +1,10 @@
 const { app, BrowserWindow } = require('electron');
 
 let win;
-app.whenReady().then(function () {
+// This test uses "app.once('ready')" while the |test-menu-null| test uses
+// "app.whenReady()", the 2 APIs have slight difference on timing to cover
+// more cases.
+app.once('ready', function () {
   win = new BrowserWindow({});
   win.setMenuBarVisibility(false);
 
