Merge pull request #11055 from electron/fix-menu-bug

fix: Don't crash on `setApplicationMenu(null)`

lib/browser/api/menu.js

@@ -133,7 +133,7 @@ Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder
 
 // set application menu with a preexisting menu
 Menu.setApplicationMenu = function (menu) {
-  if (!(menu || menu.constructor === Menu)) {
+  if (menu && menu.constructor !== Menu) {
     throw new TypeError('Invalid menu')
   }
 

spec/api-menu-spec.js

@@ -291,15 +291,22 @@ describe('Menu module', () => {
   })
 
   describe('Menu.setApplicationMenu', () => {
-    const menu = Menu.buildFromTemplate([
-      {
-        label: '1'
-      }, {
-        label: '2'
-      }
-    ])
-    Menu.setApplicationMenu(menu)
-    assert.notEqual(Menu.getApplicationMenu(), null)
+    it('sets a menu', () => {
+      const menu = Menu.buildFromTemplate([
+        {
+          label: '1'
+        }, {
+          label: '2'
+        }
+      ])
+      Menu.setApplicationMenu(menu)
+      assert.notEqual(Menu.getApplicationMenu(), null)
+    })
+
+    it('unsets a menu with null', () => {
+      Menu.setApplicationMenu(null)
+      assert.equal(Menu.getApplicationMenu(), null)
+    })
   })
 
   describe('MenuItem.click', () => {