TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-24 21:51:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

simple refactor

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-07-16 08:41:32 +08:00
parent 2051bee3cf
commit 7bc98ee434
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/video_service.rs
View File

@@ -503,7 +503,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
let _wake_lock = get_wake_lock();
// ensure_inited() is needed because release_resource() may be called.
// ensure_inited() is needed because clear() may be called.
#[cfg(target_os = "linux")]
super::wayland::ensure_inited()?;
#[cfg(windows)]
@@ -624,7 +624,7 @@ fn run(sp: GenericService) -> ResultType<()> {
}
if c.current != *CURRENT_DISPLAY.lock().unwrap() {
#[cfg(target_os = "linux")]
wayland::clear();
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -660,7 +660,7 @@ fn run(sp: GenericService) -> ResultType<()> {
sp.send(msg_out);
log::info!("Displays changed");
#[cfg(target_os = "linux")]
wayland::clear();
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -729,7 +729,7 @@ fn run(sp: GenericService) -> ResultType<()> {
// Do not reset the capturer for now, as it will cause the prompt to show every few minutes.
// https://github.com/rustdesk/rustdesk/issues/4276
//
// super::wayland::release_resource();
// super::wayland::clear();
// bail!("Wayland capturer none 100 times, try restart capture");
}
}
@@ -739,7 +739,7 @@ fn run(sp: GenericService) -> ResultType<()> {
if check_display_changed(c.ndisplay, c.current, c.width, c.height) {
log::info!("Displays changed");
#[cfg(target_os = "linux")]
wayland::clear();
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -784,9 +784,7 @@ fn run(sp: GenericService) -> ResultType<()> {
}
#[cfg(target_os = "linux")]
if !scrap::is_x11() {
super::wayland::release_resource();
}
super::wayland::clear();
Ok(())
}