weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into flutter_desktop

Browse Source
This commit is contained in:
21pages
2022-08-25 11:50:30 +08:00
parent 1f457dec41 3b3d34fabf
commit f9db9fc87a
43 changed files with 1282 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@@ -166,7 +166,7 @@ fn main() {
}
fn import_config(path: &str) {
use hbb_common::{config::*, get_modified_time};
use hbb_common::{config::*, get_exe_time, get_modified_time};
let path2 = path.replace(".toml", "2.toml");
let path2 = std::path::Path::new(&path2);
let path = std::path::Path::new(path);
@@ -176,7 +176,9 @@ fn import_config(path: &str) {
log::info!("Empty source config, skipped");
return;
}
if get_modified_time(&path) > get_modified_time(&Config::file()) {
if get_modified_time(&path) > get_modified_time(&Config::file())
&& get_modified_time(&path) < get_exe_time()
{
if store_path(Config::file(), config).is_err() {
log::info!("config written");
}