✨ #9032

siyuan-note · Aug 30, 2023 · c1478c2 · c1478c2
1 parent 54aae54
commit c1478c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/electron/main.js b/app/electron/main.js
@@ -811,7 +811,7 @@ app.whenReady().then(() => {
                     });
                 });
             } else {
-                globalShortcut.register(data.hotkey, () => {
+                globalShortcut.register(shortcut, () => {
                     BrowserWindow.getAllWindows().forEach(itemB => {
                         itemB.webContents.send("siyuan-hotkey", {
                             hotkey: item

diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts
@@ -116,7 +116,6 @@ export const onGetConfig = (isStart: boolean, app: App) => {
         id: getCurrentWindow().id,
         port: location.port
     });
-    sendGlobalShortcut(app);
     webFrame.setZoomFactor(window.siyuan.storage[Constants.LOCAL_ZOOM]);
     /// #endif
     if (!window.siyuan.config.uiLayout || (window.siyuan.config.uiLayout && !window.siyuan.config.uiLayout.left)) {
@@ -127,6 +126,9 @@ export const onGetConfig = (isStart: boolean, app: App) => {
         window.siyuan.emojis = response.data as IEmoji[];
         try {
             JSONToLayout(app, isStart);
+            /// #if !BROWSER
+            sendGlobalShortcut(app);
+            /// #endif
             openChangelog();
         } catch (e) {
             resetLayout();
@@ -309,7 +311,7 @@ export const initWindow = (app: App) => {
         let matchCommand = false;
         app.plugins.find(item => {
             item.commands.find(command => {
-                if (command.globalCallback && data === command.customHotkey) {
+                if (command.globalCallback && data.hotkey === command.customHotkey) {
                     matchCommand = true;
                     command.globalCallback();
                     return true;