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

fix unneccesary portable prompt window

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-01-27 13:03:35 +08:00
parent a8c3499d7b
commit ab026d5055
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/windows.rs
View File

@ -839,6 +839,11 @@ pub fn check_update_broker_process() -> ResultType<()> {
let cur_dir = exe_file.parent().unwrap(); let cur_dir = exe_file.parent().unwrap();
let cur_exe = cur_dir.join(process_exe); let cur_exe = cur_dir.join(process_exe);
if !std::path::Path::new(&cur_exe).exists() {
std::fs::copy(origin_process_exe, cur_exe)?;
return Ok(());
}
let ori_modified = fs::metadata(origin_process_exe)?.modified()?; let ori_modified = fs::metadata(origin_process_exe)?.modified()?;
if let Ok(metadata) = fs::metadata(&cur_exe) { if let Ok(metadata) = fs::metadata(&cur_exe) {
if let Ok(cur_modified) = metadata.modified() { if let Ok(cur_modified) = metadata.modified() {

2
src/server/connection.rs
View File

@ -1274,7 +1274,7 @@ impl Connection {
.retain(|_, v| v.0.elapsed() < SWITCH_SIDES_TIMEOUT); .retain(|_, v| v.0.elapsed() < SWITCH_SIDES_TIMEOUT);
let uuid_old = SWITCH_SIDES_UUID.lock().unwrap().remove(&lr.my_id); let uuid_old = SWITCH_SIDES_UUID.lock().unwrap().remove(&lr.my_id);
if let Ok(uuid) = uuid::Uuid::from_slice(_s.uuid.to_vec().as_ref()) { if let Ok(uuid) = uuid::Uuid::from_slice(_s.uuid.to_vec().as_ref()) {
if let Some((instant, uuid_old)) = uuid_old { if let Some((_instant, uuid_old)) = uuid_old {
if uuid == uuid_old { if uuid == uuid_old {
self.from_switch = true; self.from_switch = true;
self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true); self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true);

13
src/ui_cm_interface.rs
View File

@ -449,14 +449,11 @@ pub async fn start_ipc<T: InvokeUiCM>(cm: ConnectionManager<T>) {
#[cfg(windows)] #[cfg(windows)]
std::thread::spawn(move || { std::thread::spawn(move || {
log::info!("try create privacy mode window"); log::info!("try create privacy mode window");
#[cfg(windows)] if let Err(e) = crate::platform::windows::check_update_broker_process() {
{ log::warn!(
if let Err(e) = crate::platform::windows::check_update_broker_process() { "Failed to check update broker process. Privacy mode may not work properly. {}",
log::warn!( e
"Failed to check update broker process. Privacy mode may not work properly. {}", );
e
);
}
} }
allow_err!(crate::ui::win_privacy::start()); allow_err!(crate::ui::win_privacy::start());
}); });