rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2025-07-01 07:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from 21pages/fix_sync_socks_from_advanced_options_to_config

Browse Source 
fix sync socks from advanced options to config file
This commit is contained in:
RustDesk 2025-05-14 13:56:07 +08:00 committed by GitHub
commit 53709d8f8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/config.rs
View File

@ -1069,10 +1069,47 @@ impl Config {
}
pub fn set_socks(socks: Option<Socks5Server>) {
if OVERWRITE_SETTINGS
.read()
.unwrap()
.contains_key(keys::OPTION_PROXY_URL)
{
return;
}
let mut config = CONFIG2.write().unwrap();
if config.socks == socks {
return;
}
if config.socks.is_none() {
let equal_to_default = |key: &str, value: &str| {
DEFAULT_SETTINGS
.read()
.unwrap()
.get(key)
.map_or(false, |x| *x == value)
};
let contains_url = DEFAULT_SETTINGS
.read()
.unwrap()
.get(keys::OPTION_PROXY_URL)
.is_some();
let url = equal_to_default(
keys::OPTION_PROXY_URL,
&socks.clone().unwrap_or_default().proxy,
);
let username = equal_to_default(
keys::OPTION_PROXY_USERNAME,
&socks.clone().unwrap_or_default().username,
);
let password = equal_to_default(
keys::OPTION_PROXY_PASSWORD,
&socks.clone().unwrap_or_default().password,
);
if contains_url && url && username && password {
return;
}
}
config.socks = socks;
config.store();
}