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

Merge branch 'master' of github.com-rustdesk:rustdesk/rustdesk

Browse Source
This commit is contained in:
rustdesk 2022-04-30 16:43:01 +08:00
commit f6612d39bf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server.rs
View File

@ -4,7 +4,7 @@ use hbb_common::{
allow_err, allow_err,
anyhow::{anyhow, Context}, anyhow::{anyhow, Context},
bail, bail,
config::{Config, Config2, CONNECT_TIMEOUT, RELAY_PORT}, config::{Config, CONNECT_TIMEOUT, RELAY_PORT},
log, log,
message_proto::*, message_proto::*,
protobuf::{Message as _, ProtobufEnum}, protobuf::{Message as _, ProtobufEnum},
@ -333,6 +333,7 @@ async fn sync_and_watch_config_dir() {
return; return;
} }
use hbb_common::config::Config2;
let mut cfg0 = (Config::get(), Config2::get()); let mut cfg0 = (Config::get(), Config2::get());
let mut synced = false; let mut synced = false;
let tries = let tries =