chore: 🤖 disable global shortcut

Author: ZingerLittleBee

CHANGELOG.md

@@ -1,3 +1,8 @@
+## `2.2.2` (2023-11-15)
+
+### Chore
+- Disable global shortcut
+
 ## `2.2.1` (2023-10-26)
 
 ### Chore

package.json

@@ -1,7 +1,7 @@
 {
   "name": "server-milk",
   "private": true,
-  "version": "2.2.1",
+  "version": "2.2.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "server_milk"
-version = "2.2.1"
+version = "2.2.2"
 description = "A desktop program for iOS application named ServerBee"
 authors = ["ZingerLittleBee"]
 license = ""

src-tauri/Cargo.toml

@@ -18,7 +18,6 @@ use tauri::Manager;
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_store::StoreBuilder;
 
-use crate::shortcut::register_shortcut;
 use crate::state::SidecarState;
 use crate::window_manager::configure_control_panel;
 
@@ -114,7 +113,7 @@ fn main() {
 
             configure_control_panel(&main_window);
 
-            register_shortcut(app.handle());
+            // register_shortcut(app.handle());
             Ok(())
         })
         .run(tauri::generate_context!())

src-tauri/src/main.rs

@@ -1,12 +1,23 @@
+use log::error;
 use tauri::{GlobalShortcutManager, Manager};
+use crate::constant::DEFAULT_WINDOW_LABEL;
 
 pub fn register_shortcut(handle: tauri::AppHandle) {
     let mut manager = handle.global_shortcut_manager();
-    manager.register(
+    match manager.register(
         "CmdOrCtrl+,",
         move || {
-            let settings_window = handle.get_window("main").unwrap();
-            settings_window.show().unwrap();
+            if let Some(settings_window) = handle.get_window(DEFAULT_WINDOW_LABEL) {
+                match settings_window.show() {
+                    Ok(_) => {},
+                    Err(e) => error!("error showing settings window while registering shortcut: {}", e),
+                }
+            } else {
+                error!("settings window not found while registering shortcut");
+            }
         },
-    ).unwrap();
+    ) {
+        Ok(_) => {},
+        Err(e) => error!("error registering shortcut: {}", e),
+    }
 }

src-tauri/src/shortcut.rs

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "ServerMilk",
-    "version": "2.2.1"
+    "version": "2.2.2"
   },
   "build": {
     "beforeDevCommand": "pnpm dev",