root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 00:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify version check logic in run_core_by_service and update tray menu function call

Browse Source
This commit is contained in:
Tunglies
2025-06-10 23:10:28 +08:00
parent d05b1c3130
commit cbcab72a7c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/core/service.rs
View File

@@ -845,12 +845,10 @@ pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> {
} }
}; };
if version_check { if version_check && is_service_available().await.is_ok() {
if is_service_available().await.is_ok() {
log::info!(target: "app", "服务已在运行且版本匹配，尝试使用"); log::info!(target: "app", "服务已在运行且版本匹配，尝试使用");
return start_with_existing_service(config_file).await; return start_with_existing_service(config_file).await;
} }
}
if !version_check { if !version_check {
log::info!(target: "app", "服务版本不匹配，尝试重装"); log::info!(target: "app", "服务版本不匹配，尝试重装");

2
src-tauri/src/core/tray/mod.rs
View File

@@ -270,7 +270,7 @@ impl Tray {
match app_handle.tray_by_id("main") { match app_handle.tray_by_id("main") {
Some(tray) => { Some(tray) => {
let _ = tray.set_menu(Some(create_tray_menu( let _ = tray.set_menu(Some(create_tray_menu(
&app_handle, app_handle,
Some(mode.as_str()), Some(mode.as_str()),
*system_proxy, *system_proxy,
*tun_mode, *tun_mode,