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

fix: wayland, accept conn (#7951)

Browse Source 
Show prompt window after the controlled side accepting the connection.

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-05-08 09:50:55 +08:00 committed by GitHub
parent 5537c525ca
commit a3b4dcf762
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/connection.rs
View File

@ -1228,6 +1228,10 @@ impl Connection {
if self.file_transfer.is_some() { if self.file_transfer.is_some() {
res.set_peer_info(pi); res.set_peer_info(pi);
} else { } 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(any(target_os = "android", target_os = "ios")))]
{ {
#[cfg(not(windows))] #[cfg(not(windows))]
@ -1249,9 +1253,6 @@ impl Connection {
} }
try_activate_screen(); 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 { match super::display_service::update_get_sync_displays().await {
Err(err) => { Err(err) => {

8
src/server/video_service.rs
View File

@ -838,14 +838,6 @@ fn handle_one_frame(
Ok(send_conn_ids) Ok(send_conn_ids)
} }
pub fn is_inited_msg() -> Option<Message> {
#[cfg(target_os = "linux")]
if !is_x11() {
return super::wayland::is_inited();
}
None
}
#[inline] #[inline]
pub fn refresh() { pub fn refresh() {
#[cfg(target_os = "android")] #[cfg(target_os = "android")]