kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

xwayland: kill xwayland when wayland connection fails

Browse source
This commit is contained in:
Julian Orth 2025-05-04 19:02:35 +02:00
parent 9840150e40
commit 8b9784bb15
6 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client.rs
View file

@ -19,6 +19,7 @@ use {
numcell::NumCell,
pending_serial::PendingSerial,
pid_info::{PidInfo, get_pid_info, get_socket_creds},
pidfd_send_signal::pidfd_send_signal,
},
wire::WlRegistryId,
},
@ -251,6 +252,13 @@ impl Drop for ClientHolder {
self.data.surfaces_by_xwayland_serial.clear();
self.data.remove_activation_tokens();
self.data.commit_timelines.clear();
if self.data.is_xwayland {
if let Some(pidfd) = self.data.state.xwayland.pidfd.get() {
if let Err(e) = pidfd_send_signal(&pidfd, c::SIGKILL) {
log::error!("Could not kill Xwayland: {}", ErrorFmt(e));
}
}
}
}
}