diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 9d6eec85c..3b9db0697 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -431,7 +431,7 @@ fn check_displays_new() -> Option> { } } -fn check_displays_changed() -> Option { +fn check_get_displays_changed_msg() -> Option { let displays = check_displays_new()?; let (current, displays) = get_displays_2(&displays); let mut pi = PeerInfo { @@ -585,11 +585,8 @@ fn run(sp: GenericService) -> ResultType<()> { bail!("SWITCH"); } - if let Some(msg_out) = check_displays_changed() { + if let Some(msg_out) = check_get_displays_changed_msg() { sp.send(msg_out); - } - - if c.ndisplay != get_display_num() { log::info!("Displays changed"); *SWITCH.lock().unwrap() = true; bail!("SWITCH"); @@ -845,21 +842,6 @@ pub fn handle_one_frame_encoded( Ok(send_conn_ids) } -fn get_display_num() -> usize { - #[cfg(target_os = "linux")] - { - if !scrap::is_x11() { - return if let Ok(n) = super::wayland::get_display_num() { - n - } else { - 0 - }; - } - } - - LAST_SYNC_DISPLAYS.read().unwrap().len() -} - pub(super) fn get_displays_2(all: &Vec) -> (usize, Vec) { let mut displays = Vec::new(); let mut primary = 0; diff --git a/src/server/wayland.rs b/src/server/wayland.rs index 954f1ed1d..73a022871 100644 --- a/src/server/wayland.rs +++ b/src/server/wayland.rs @@ -230,19 +230,6 @@ pub(super) fn get_primary() -> ResultType { } } -pub(super) fn get_display_num() -> ResultType { - let addr = *CAP_DISPLAY_INFO.read().unwrap(); - if addr != 0 { - let cap_display_info: *const CapDisplayInfo = addr as _; - unsafe { - let cap_display_info = &*cap_display_info; - Ok(cap_display_info.num) - } - } else { - bail!("Failed to get capturer display info"); - } -} - #[allow(dead_code)] pub(super) fn release_resource() { if scrap::is_x11() {