From e9721ecc4db9566bde31695c3f4f53a84519b093 Mon Sep 17 00:00:00 2001 From: huzibaca Date: Sun, 22 Sep 2024 00:41:20 +0800 Subject: [PATCH] Revert "chore: remove useless exit codes and hooks" This reverts commit 40ff3fd4bf59f52f23904c3150de6ff17974d23f. --- src-tauri/src/core/tray.rs | 1 + src-tauri/src/feat.rs | 1 + src-tauri/src/lib.rs | 3 +++ 3 files changed, 5 insertions(+) diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index d57bbbf8..2c6817a2 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -428,6 +428,7 @@ fn on_menu_event(app_handle: &AppHandle, event: MenuEvent) { "restart_clash" => feat::restart_clash_core(), "restart_app" => tauri::process::restart(&app_handle.env()), "quit" => { + println!("quit"); feat::quit(); } _ => {} diff --git a/src-tauri/src/feat.rs b/src-tauri/src/feat.rs index 91e88a7b..0ec9314f 100644 --- a/src-tauri/src/feat.rs +++ b/src-tauri/src/feat.rs @@ -110,6 +110,7 @@ pub fn quit() { let _ = resolve::save_window_size_position(&app_handle, true); resolve::resolve_reset(); app_handle.exit(0); + std::process::exit(0); } } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index cf9d4cbf..6d1756b0 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -134,6 +134,9 @@ pub fn run() { .expect("error while running tauri application"); app.run(|app_handle, e| match e { + tauri::RunEvent::ExitRequested { api, .. } => { + api.prevent_exit(); + } tauri::RunEvent::WindowEvent { label, event, .. } => { if label == "main" { match event {