From b699ce62a1793b9181b85882e28a8fd50e950f9b Mon Sep 17 00:00:00 2001 From: Shawn Wallace Date: Tue, 7 Jan 2025 21:27:27 -0500 Subject: [PATCH] Avoid crashing if entered surface's window is not a known window Not sure how this even happens, but should fix #88 --- src/server/event.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/event.rs b/src/server/event.rs index e76f272..e9d635d 100644 --- a/src/server/event.rs +++ b/src/server/event.rs @@ -127,11 +127,7 @@ impl SurfaceData { self.output_key = Some(key); debug!("{} entered {}", self.server.id(), output.server.id()); let windows = &mut state.windows; - if let Some(win_data) = self - .window - .as_ref() - .map(|win| windows.get_mut(&win).unwrap()) - { + if let Some(win_data) = self.window.as_ref().and_then(|win| windows.get_mut(win)) { let (x, y) = match output.position { OutputPosition::Xdg { x, y } => (x, y), OutputPosition::Wl { x, y } => (x, y),