bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix surface data unwrap crash in pending activations handling

Browse source 
Fixes #127.
This commit is contained in:
bbb651 2025-03-22 15:31:12 +02:00 • committed by Shawn Wallace
parent 1d98ee089c
commit 467f3014fb
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/server/mod.rs
View file

@ -1043,12 +1043,15 @@ impl<C: XConnection> ServerState<C> {
let globals = &mut self.clientside.globals;
globals.pending_activations.retain(|(window, token)| {
if let Some(window) = self.windows.get(window) {
if let Some(key) = window.surface_key {
let surface: &SurfaceData = self.objects[key].as_ref();
activation_state.activate::<Self>(&surface.client, token.clone());
return false;
}
if let Some(surface) = self
.windows
.get(window)
.and_then(|window| window.surface_key)
.and_then(|key| self.objects.get(key))
.map(AsRef::<SurfaceData>::as_ref)
{
activation_state.activate::<Self>(&surface.client, token.clone());
return false;
}
true
});