diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-01-03 10:40:25 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-01-03 11:45:11 +0100 |
| commit | ce69c0caf2acdeb58aa1828eb37bb5e2311cd5ca (patch) | |
| tree | 43c45083a509cdc0e92218ca663f22bb349eaaf3 | |
| parent | 8d3c1761c2e3f744b883d52b71b51740cabf483a (diff) | |
| download | mullvadvpn-ce69c0caf2acdeb58aa1828eb37bb5e2311cd5ca.tar.xz mullvadvpn-ce69c0caf2acdeb58aa1828eb37bb5e2311cd5ca.zip | |
Disable cmd+Q hotkey
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | gui/src/main/user-interface.ts | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f4e5f871fd..b82df24ca4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,10 @@ Line wrap the file at 100 chars. Th #### Windows - Remove all settings when the app is uninstalled silently. +### Removed +#### macOS +- Remove ⌘Q shortcut. + ### Fixed - When a country is selected, and the constraints only match relays that are not included on the country level, select those relays anyway. diff --git a/gui/src/main/user-interface.ts b/gui/src/main/user-interface.ts index 9870c89702..88922f3f75 100644 --- a/gui/src/main/user-interface.ts +++ b/gui/src/main/user-interface.ts @@ -411,9 +411,9 @@ export default class UserInterface implements WindowControllerDelegate { // On macOS, hotkeys are bound to the app menu and won't work if it's not set, // even though the app menu itself is not visible because the app does not appear in the dock. private setMacOsAppMenu() { - const mullvadVpnSubmenu: Electron.MenuItemConstructorOptions[] = [{ role: 'quit' }]; + const mullvadVpnSubmenu: Electron.MenuItemConstructorOptions[] = []; if (process.env.NODE_ENV === 'development') { - mullvadVpnSubmenu.unshift({ role: 'reload' }, { role: 'forceReload' }); + mullvadVpnSubmenu.unshift({ role: 'quit' }, { role: 'reload' }, { role: 'forceReload' }); } const template: Electron.MenuItemConstructorOptions[] = [ |