From 7cc39cb54d921d538c2804f86a11b815e852b538 Mon Sep 17 00:00:00 2001 From: Josiah Glosson Date: Tue, 15 Jul 2025 20:28:34 -0500 Subject: [PATCH] Fix build on Mac --- apps/app/src/main.rs | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs index 8c4ce69ba..e51bb36a8 100644 --- a/apps/app/src/main.rs +++ b/apps/app/src/main.rs @@ -240,34 +240,9 @@ fn main() { match app { Ok(app) => { app.run(|app, event| { - #[cfg(not(any(target_os = "macos", feature = "updater")))] + #[cfg(not(any(feature = "updater", target_os = "macos")))] drop((app, event)); - #[cfg(target_os = "macos")] - if let tauri::RunEvent::Opened { urls } = event { - tracing::info!("Handling webview open {urls:?}"); - - let file = urls - .into_iter() - .find_map(|url| url.to_file_path().ok()); - - if let Some(file) = file { - let payload = - macos::deep_link::get_or_init_payload(app); - - let mtx_copy = payload.payload; - let request = file.to_string_lossy().to_string(); - tauri::async_runtime::spawn(async move { - let mut payload = mtx_copy.lock().await; - if payload.is_none() { - *payload = Some(request.clone()); - } - - let _ = api::utils::handle_command(request).await; - }); - } - } - #[cfg(feature = "updater")] if matches!(event, tauri::RunEvent::Exit) { let update_data = app.state::().inner(); @@ -299,6 +274,31 @@ fn main() { } } } + + #[cfg(target_os = "macos")] + if let tauri::RunEvent::Opened { urls } = event { + tracing::info!("Handling webview open {urls:?}"); + + let file = urls + .into_iter() + .find_map(|url| url.to_file_path().ok()); + + if let Some(file) = file { + let payload = + macos::deep_link::get_or_init_payload(app); + + let mtx_copy = payload.payload; + let request = file.to_string_lossy().to_string(); + tauri::async_runtime::spawn(async move { + let mut payload = mtx_copy.lock().await; + if payload.is_none() { + *payload = Some(request.clone()); + } + + let _ = api::utils::handle_command(request).await; + }); + } + } }); } Err(e) => {