vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test if xwayland is already shutting down on client_destroy

This commit is contained in:
Christian Meissl 2021-06-28 15:38:54 +02:00 committed by Victor Berger
parent da937d498e
commit 29c0620a58
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xwayland/xserver.rs
View File

@ -295,7 +295,12 @@ impl<Data> Inner<Data> {
fn client_destroy<Data: 'static>(map: &::wayland_server::UserDataMap) { fn client_destroy<Data: 'static>(map: &::wayland_server::UserDataMap) {
let inner = map.get::<Rc<RefCell<Inner<Data>>>>().unwrap(); let inner = map.get::<Rc<RefCell<Inner<Data>>>>().unwrap();
inner.borrow_mut().shutdown(); // If we are unable to take a lock we are most likely called during
// a shutdown. This will definitely be the case when the compositor exits
// and the XWayland instance is dropped.
if let Ok(mut guard) = inner.try_borrow_mut() {
guard.shutdown();
}
} }
fn xwayland_ready<Data: 'static>(inner: &Rc<RefCell<Inner<Data>>>) { fn xwayland_ready<Data: 'static>(inner: &Rc<RefCell<Inner<Data>>>) {
@ -322,7 +327,7 @@ fn xwayland_ready<Data: 'static>(inner: &Rc<RefCell<Inner<Data>>>) {
::std::env::set_var("DISPLAY", format!(":{}", instance.display_lock.display())); ::std::env::set_var("DISPLAY", format!(":{}", instance.display_lock.display()));
// signal the WM // signal the WM
info!(guard.log, "XWayland is ready, signaling the WM."); info!(guard.log, "XWayland is ready on DISPLAY \":{}\", signaling the WM.", instance.display_lock.display());
// send error occurs if the user dropped the channel... We cannot do much except ignore. // send error occurs if the user dropped the channel... We cannot do much except ignore.
let _ = guard.sender.send(XWaylandEvent::Ready { let _ = guard.sender.send(XWaylandEvent::Ready {
connection: instance.wm_fd.take().unwrap(), // This is a bug if None connection: instance.wm_fd.take().unwrap(), // This is a bug if None