aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Bennett <hello@vantezzen.io>2019-10-01 07:49:43 +0200
committerLibravatar GitHub <noreply@github.com>2019-10-01 07:49:43 +0200
commita7ec91ad94b6c27812a1f5fd41fbd205fe6646c7 (patch)
treeb17c949fb8c96a945c120dc0fb20a4e2224c8ebf
parentMerge branch 'master' of https://github.com/getferdi/ferdi (diff)
parentRevert shortcut for Mac (diff)
downloadferdium-app-a7ec91ad94b6c27812a1f5fd41fbd205fe6646c7.tar.gz
ferdium-app-a7ec91ad94b6c27812a1f5fd41fbd205fe6646c7.tar.zst
ferdium-app-a7ec91ad94b6c27812a1f5fd41fbd205fe6646c7.zip
Merge pull request #86 from Makazzz/shortcut
Fix QuickSwitch Shortcut to not overwrite Settings Shortcut on non-Mac devices
-rw-r--r--src/lib/Menu.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 80fa0e463..183ae6472 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -345,7 +345,7 @@ const _templateFactory = intl => [
345 }, 345 },
346 { 346 {
347 label: intl.formatMessage(menuItems.openQuickSwitch), 347 label: intl.formatMessage(menuItems.openQuickSwitch),
348 accelerator: 'CmdOrCtrl+P', 348 accelerator: 'CmdOrCtrl+S',
349 click() { 349 click() {
350 window.ferdi.features.quickSwitch.state.isModalVisible = true; 350 window.ferdi.features.quickSwitch.state.isModalVisible = true;
351 }, 351 },
@@ -549,7 +549,7 @@ const _titleBarTemplateFactory = intl => [
549 }, 549 },
550 { 550 {
551 label: intl.formatMessage(menuItems.openQuickSwitch), 551 label: intl.formatMessage(menuItems.openQuickSwitch),
552 accelerator: 'CmdOrCtrl+P', 552 accelerator: 'CmdOrCtrl+S',
553 click() { 553 click() {
554 window.ferdi.features.quickSwitch.state.isModalVisible = true; 554 window.ferdi.features.quickSwitch.state.isModalVisible = true;
555 }, 555 },