From 3b61384c264b39b4c290057b23283aef89b6538c Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Tue, 29 Jan 2019 22:11:47 -0800 Subject: [PATCH] fix: register accelerator if role has no registerAccelerator (backport: 3-1-x) (#16598) * fix: register accelerator if role has no registerAccelerator * ensure roles[role].registerAccelerator is defined --- lib/browser/api/menu-item-roles.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/browser/api/menu-item-roles.js b/lib/browser/api/menu-item-roles.js index 3b5b302eab24..2c278a17275b 100644 --- a/lib/browser/api/menu-item-roles.js +++ b/lib/browser/api/menu-item-roles.js @@ -246,7 +246,8 @@ exports.getDefaultAccelerator = (role) => { } exports.shouldRegisterAccelerator = (role) => { - return roles.hasOwnProperty(role) ? roles[role].registerAccelerator : true + const hasRoleRegister = roles.hasOwnProperty(role) && roles[role].registerAccelerator !== undefined + return hasRoleRegister ? roles[role].registerAccelerator : true } exports.getDefaultSubmenu = (role) => {