From 2d1ab70818f8f0fbeae369a81ea7859f3104e41b Mon Sep 17 00:00:00 2001
From: fullex <106392080+0xfullex@users.noreply.github.com>
Date: Tue, 18 Mar 2025 18:06:08 +0800
Subject: [PATCH] fix: [ #3221 ] should not enable shortcut of quickAssistant
 when it's not available (#3228)

---
 src/main/services/ShortcutService.ts | 63 +++++++++++++++-------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/main/services/ShortcutService.ts b/src/main/services/ShortcutService.ts
index 79ddf9b7..6a6be317 100644
--- a/src/main/services/ShortcutService.ts
+++ b/src/main/services/ShortcutService.ts
@@ -128,44 +128,49 @@ export function registerShortcuts(window: BrowserWindow) {
           return
         }
 
-        const handler = getShortcutHandler(shortcut)
+        //if not enabled, exit early from the process.
+        if (!shortcut.enabled) {
+          return
+        }
 
+        const handler = getShortcutHandler(shortcut)
         if (!handler) {
           return
         }
 
-        const accelerator = formatShortcutKey(shortcut.shortcut)
+        switch (shortcut.key) {
+          case 'show_app':
+            showAppAccelerator = formatShortcutKey(shortcut.shortcut)
+            break
 
-        if (shortcut.key === 'show_app' && shortcut.enabled) {
-          showAppAccelerator = accelerator
+          case 'mini_window':
+            //available only when QuickAssistant enabled
+            if (configManager.getEnableQuickAssistant()) {
+              showMiniWindowAccelerator = formatShortcutKey(shortcut.shortcut)
+            }
+            break
+
+          //the following ZOOMs will register shortcuts seperately, so will return
+          case 'zoom_in':
+            globalShortcut.register('CommandOrControl+=', () => handler(window))
+            globalShortcut.register('CommandOrControl+numadd', () => handler(window))
+            return
+
+          case 'zoom_out':
+            globalShortcut.register('CommandOrControl+-', () => handler(window))
+            globalShortcut.register('CommandOrControl+numsub', () => handler(window))
+            return
+
+          case 'zoom_reset':
+            globalShortcut.register('CommandOrControl+0', () => handler(window))
+            return
         }
 
-        if (shortcut.key === 'mini_window' && shortcut.enabled) {
-          showMiniWindowAccelerator = accelerator
-        }
+        const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
+          shortcut.shortcut
+        )
 
-        if (shortcut.key.includes('zoom')) {
-          switch (shortcut.key) {
-            case 'zoom_in':
-              globalShortcut.register('CommandOrControl+=', () => shortcut.enabled && handler(window))
-              globalShortcut.register('CommandOrControl+numadd', () => shortcut.enabled && handler(window))
-              return
-            case 'zoom_out':
-              globalShortcut.register('CommandOrControl+-', () => shortcut.enabled && handler(window))
-              globalShortcut.register('CommandOrControl+numsub', () => shortcut.enabled && handler(window))
-              return
-            case 'zoom_reset':
-              globalShortcut.register('CommandOrControl+0', () => shortcut.enabled && handler(window))
-              return
-          }
-        }
-
-        if (shortcut.enabled) {
-          const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
-            shortcut.shortcut
-          )
-          globalShortcut.register(accelerator, () => handler(window))
-        }
+        globalShortcut.register(accelerator, () => handler(window))
       } catch (error) {
         Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`)
       }