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

Merge pull request #5017 from 21pages/fix

Browse Source 
clear hwcodec config rather than remove
This commit is contained in:
RustDesk 2023-07-16 11:53:32 +08:00 committed by GitHub
commit a24a7e8d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,10 +81,7 @@ const CHARS: &[char] = &[
'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
]; ];
pub const RENDEZVOUS_SERVERS: &[&str] = &[ pub const RENDEZVOUS_SERVERS: &[&str] = &["rs-ny.rustdesk.com", "rs-sg.rustdesk.com"];
"rs-ny.rustdesk.com",
"rs-sg.rustdesk.com",
];
pub const RS_PUB_KEY: &str = match option_env!("RS_PUB_KEY") { pub const RS_PUB_KEY: &str = match option_env!("RS_PUB_KEY") {
Some(key) if !key.is_empty() => key, Some(key) if !key.is_empty() => key,
@ -1350,8 +1347,8 @@ impl HwCodecConfig {
Config::store_(self, "_hwcodec"); Config::store_(self, "_hwcodec");
} }
pub fn remove() { pub fn clear() {
std::fs::remove_file(Config::file_("_hwcodec")).ok(); HwCodecConfig::default().store();
} }
/// refresh current global HW_CODEC_CONFIG, usually uesd after HwCodecConfig::remove() /// refresh current global HW_CODEC_CONFIG, usually uesd after HwCodecConfig::remove()

4
libs/scrap/src/common/hwcodec.rs
View File

@ -332,9 +332,9 @@ pub fn check_config_process() {
use hbb_common::sysinfo::{ProcessExt, System, SystemExt}; use hbb_common::sysinfo::{ProcessExt, System, SystemExt};
std::thread::spawn(move || { std::thread::spawn(move || {
// Remove to avoid checking process errors // Clear to avoid checking process errors
// But when the program is just started, the configuration file has not been updated, and the new connection will read an empty configuration // But when the program is just started, the configuration file has not been updated, and the new connection will read an empty configuration
HwCodecConfig::remove(); HwCodecConfig::clear();
if let Ok(exe) = std::env::current_exe() { if let Ok(exe) = std::env::current_exe() {
if let Some(file_name) = exe.file_name().to_owned() { if let Some(file_name) = exe.file_name().to_owned() {
let s = System::new_all(); let s = System::new_all();