From a3b4dcf76292a3b62b09cd329b14ccdf8ab2c805 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 8 May 2024 09:50:55 +0800 Subject: [PATCH] fix: wayland, accept conn (#7951) Show prompt window after the controlled side accepting the connection. Signed-off-by: fufesou --- src/server/connection.rs | 7 ++++--- src/server/video_service.rs | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/server/connection.rs b/src/server/connection.rs index 9536d4e92..1a402713f 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -1228,6 +1228,10 @@ impl Connection { if self.file_transfer.is_some() { res.set_peer_info(pi); } else { + if let Some(msg_out) = super::display_service::is_inited_msg() { + self.send(msg_out).await; + } + #[cfg(not(any(target_os = "android", target_os = "ios")))] { #[cfg(not(windows))] @@ -1249,9 +1253,6 @@ impl Connection { } try_activate_screen(); - if let Some(msg_out) = super::video_service::is_inited_msg() { - self.send(msg_out).await; - } match super::display_service::update_get_sync_displays().await { Err(err) => { diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 3381fa709..a75b1c5b4 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -838,14 +838,6 @@ fn handle_one_frame( Ok(send_conn_ids) } -pub fn is_inited_msg() -> Option { - #[cfg(target_os = "linux")] - if !is_x11() { - return super::wayland::is_inited(); - } - None -} - #[inline] pub fn refresh() { #[cfg(target_os = "android")]