From 33c217800cca991b179051fb2dd6e1ba5cc8d08a Mon Sep 17 00:00:00 2001 From: Tw93 Date: Sat, 21 Dec 2024 11:06:24 +0800 Subject: [PATCH] :bug: Repair windows shutdown and ip check --- bin/utils/ip.ts | 2 +- src-tauri/src/lib.rs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/utils/ip.ts b/bin/utils/ip.ts index 12bd858..c3b6434 100644 --- a/bin/utils/ip.ts +++ b/bin/utils/ip.ts @@ -47,7 +47,7 @@ async function isChinaIP(ip: string, domain: string): Promise { try { const delay = await ping(ip); logger.debug(`${domain} latency is ${delay} ms`); - return delay > 500; + return delay > 1000; } catch (error) { logger.debug(`ping ${domain} failed!`); return true; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 0935ddf..be8765e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -102,8 +102,6 @@ pub fn run_app() { }) .on_window_event(|window, event| { if let tauri::WindowEvent::CloseRequested { api, .. } = event { - let window = window.clone(); - #[cfg(target_os = "macos")] { let window_handle = window.clone(); @@ -116,12 +114,8 @@ pub fn run_app() { window_handle.minimize().unwrap(); window_handle.hide().unwrap(); }); + api.prevent_close(); } - - #[cfg(not(target_os = "macos"))] - window.close().unwrap(); - - api.prevent_close(); } }) .run(tauri::generate_context!())