diff --git a/src-tauri/src/core/service.rs b/src-tauri/src/core/service.rs index e42c79ecf..bc8ff4178 100644 --- a/src-tauri/src/core/service.rs +++ b/src-tauri/src/core/service.rs @@ -845,11 +845,9 @@ pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> { } }; - if version_check { - if is_service_available().await.is_ok() { - log::info!(target: "app", "服务已在运行且版本匹配,尝试使用"); - return start_with_existing_service(config_file).await; - } + if version_check && is_service_available().await.is_ok() { + log::info!(target: "app", "服务已在运行且版本匹配,尝试使用"); + return start_with_existing_service(config_file).await; } if !version_check { diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs index a97532e4a..120cfc63e 100644 --- a/src-tauri/src/core/tray/mod.rs +++ b/src-tauri/src/core/tray/mod.rs @@ -270,7 +270,7 @@ impl Tray { match app_handle.tray_by_id("main") { Some(tray) => { let _ = tray.set_menu(Some(create_tray_menu( - &app_handle, + app_handle, Some(mode.as_str()), *system_proxy, *tun_mode,