From d5abb4a6544c5128805b4d3648b59dbf0dce1bda Mon Sep 17 00:00:00 2001 From: maxichrome Date: Sat, 11 Jun 2022 19:12:13 -0500 Subject: [PATCH] Add compiler checks for dev tools in production --- apps/desktop/src-tauri/src/menu.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/desktop/src-tauri/src/menu.rs b/apps/desktop/src-tauri/src/menu.rs index 27b4dc4a7..550ab895d 100644 --- a/apps/desktop/src-tauri/src/menu.rs +++ b/apps/desktop/src-tauri/src/menu.rs @@ -72,20 +72,27 @@ fn custom_menu_bar() -> Menu { } pub(crate) fn handle_menu_event(event: WindowMenuEvent) { - let window = event.window(); match event.menu_item_id() { "quit" => { std::process::exit(0); } "close" => { + let window = event.window(); + + #[cfg(debug_assertions)] if window.is_devtools_open() { window.close_devtools(); + return; } else { window.close().unwrap(); } + + #[cfg(not(debug_assertions))] + window.close().unwrap(); } "reload_app" => { - window + event + .window() .with_webview(|webview| { #[cfg(target_os = "macos")] unsafe { @@ -95,7 +102,10 @@ pub(crate) fn handle_menu_event(event: WindowMenuEvent) { }) .unwrap(); } + #[cfg(debug_assertions)] "toggle_devtools" => { + let window = event.window(); + if window.is_devtools_open() { window.close_devtools(); } else {