summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--gui/src/main/user-interface.ts4
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[] = [