shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:43:44 +08:00
Code Packages Projects Releases Activity

,fix: when updating the verge configuration, notification error

Browse Source
This commit is contained in:
huzibaca 2024-09-27 22:25:23 +08:00
parent d73366984f
commit c10d782524
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src-tauri/src/feat.rs
View File

@ -181,7 +181,7 @@ pub async fn patch_verge(patch: IVerge) -> Result<()> {
generated = true; generated = true;
} }
} else if tun_mode.is_some() { } else if tun_mode.is_some() {
update_core_config().await?; update_core_config(false).await?;
} }
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
if (redir_enabled.is_some() || redir_port.is_some()) && !generated { if (redir_enabled.is_some() || redir_port.is_some()) && !generated {
@ -287,22 +287,26 @@ pub async fn update_profile(uid: String, option: Option<PrfOption>) -> Result<()
}; };
if should_update { if should_update {
update_core_config().await?; update_core_config(true).await?;
} }
Ok(()) Ok(())
} }
/// 更新订阅 /// 更新订阅
async fn update_core_config() -> Result<()> { async fn update_core_config(notice: bool) -> Result<()> {
match CoreManager::global().update_config().await { match CoreManager::global().update_config().await {
Ok(_) => { Ok(_) => {
handle::Handle::refresh_clash(); handle::Handle::refresh_clash();
handle::Handle::notice_message("set_config::ok", "ok"); if notice {
handle::Handle::notice_message("set_config::ok", "ok");
}
Ok(()) Ok(())
} }
Err(err) => { Err(err) => {
handle::Handle::notice_message("set_config::error", format!("{err}")); if notice {
handle::Handle::notice_message("set_config::error", format!("{err}"));
}
Err(err) Err(err)
} }
} }