hexianglong/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make event loop in tray compatible with main window

Browse Source
This commit is contained in:
Kingtous
2023-05-02 12:52:27 +08:00
Unverified
parent 4e7a8065b9
commit 7a82070420
8 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/hbb_common/src/config.rs
View File

@@ -969,13 +969,20 @@ impl PeerConfig {
fn path(id: &str) -> PathBuf {
//If the id contains invalid chars, encode it
let forbidden_paths = Regex::new(r".*[<>:/\\|\?\*].*").unwrap();
let id_encoded = if forbidden_paths.is_match(id) {
"base64_".to_string() + base64::encode(id, base64::Variant::Original).as_str()
let forbidden_paths = Regex::new(r".*[<>:/\\|\?\*].*");
let path: PathBuf;
if let Ok(forbidden_paths) = forbidden_paths {
let id_encoded = if forbidden_paths.is_match(id) {
"base64_".to_string() + base64::encode(id, base64::Variant::Original).as_str()
} else {
id.to_string()
};
path = [PEERS, id_encoded.as_str()].iter().collect();
} else {
id.to_string()
};
let path: PathBuf = [PEERS, id_encoded.as_str()].iter().collect();
log::warn!("Regex create failed: {:?}", forbidden_paths.err());
// fallback for failing to create this regex.
path = [PEERS, id.replace(":", "_").as_str()].iter().collect();
}
Config::with_extension(Config::path(path))
}