Update

harana · Apr 28, 2024 · a5d155f · a5d155f
1 parent 682aaaf
commit a5d155f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src-tauri/src/handler_welcome.rs b/src-tauri/src/handler_welcome.rs
@@ -8,6 +8,8 @@ use tauri::{AppHandle, Wry};
 use crate::globals::{ONBOARDED, WELCOME_WINDOW};
 use crate::handlers::database_core;
 use crate::windows::init_main_window;
+
+#[cfg(target_os = "macos")]
 use crate::windows_mac;
 
 #[tauri::command]
@@ -67,6 +69,8 @@ pub async fn complete_onboarding(app_handle: AppHandle<Wry>, allow_telemetry: bo
     // Init main window
     unsafe { ONBOARDED = true; }
     init_main_window(app_handle.clone()).await.unwrap();
+
+    #[cfg(target_os = "macos")]
     windows_mac::register_shortcut(app_handle.clone(), shortcut_key.to_string());
     Ok(())
 }

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -63,6 +63,8 @@ mod state;
 mod system_tray;
 mod windows;
 mod windows_main;
+
+#[cfg(target_os = "macos")]
 mod windows_mac;
 
 fn main() {

diff --git a/src-tauri/src/windows.rs b/src-tauri/src/windows.rs
@@ -9,7 +9,10 @@ use tauri::{App, AppHandle, Manager};
 
 use crate::globals::*;
 use crate::system_tray::{disable_system_tray, enable_system_tray};
-use crate::{windows_mac, windows_main};
+use crate::windows_main;
+
+#[cfg(target_os = "macos")]
+use crate::windows_mac;
 
 pub async fn create_windows(app: &mut App) -> Result<()> {
     #[cfg(target_os = "macos")]
@@ -60,6 +63,8 @@ pub async fn create_windows(app: &mut App) -> Result<()> {
         let shortcut_key = DATABASE_MANAGER.get().unwrap().core(move |c|
             settings_get(c, "appearance_shortcut_key".to_string())
         ).await?.unwrap();
+
+        #[cfg(target_os = "macos")]
         windows_mac::register_shortcut(app.handle(), shortcut_key.to_string());
 
         enable_system_tray(app.handle()).unwrap();