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

fix: when tun is closed, the full profile configuration is not restored

Browse Source
This commit is contained in:
huzibaca
2024-11-27 10:35:42 +08:00
parent b658ce7e75
commit 6e1cc80b91
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/enhance/mod.rs
View File

@@ -60,7 +60,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
global_merge,
global_script,
profile_name,
dns_enhanced_mode,
dns,
) = {
let profiles = Config::profiles();
let profiles = profiles.latest();
@@ -131,12 +131,9 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
.and_then(|item| item.name.clone())
.unwrap_or_default();
let dns_enhanced_mode = current
.get("dns")
.and_then(|val| val.get("enhanced-mode"))
.and_then(|val| val.as_str())
.unwrap_or("redir-host")
.to_string();
let dns = current.get("dns").map_or(Mapping::new(), |val| {
val.as_mapping().cloned().unwrap_or(Mapping::new())
});
(
current,
@@ -148,7 +145,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
global_merge,
global_script,
name,
dns_enhanced_mode,
dns,
)
};
@@ -268,7 +265,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
});
}
config = use_tun(config, enable_tun, dns_enhanced_mode).await;
config = use_tun(config, enable_tun, dns).await;
config = use_sort(config);
let mut exists_set = HashSet::new();