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

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

View File

@@ -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 {

View File

@@ -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,