From da3b2838d22937d24c65756f517f6a7ddeae1057 Mon Sep 17 00:00:00 2001 From: En-En <39373446+En-En-Code@users.noreply.github.com> Date: Sun, 22 Jun 2025 21:33:47 +0000 Subject: [PATCH] Fixed stale surface check unwrapping Regression from 799027d1. Unwraps on a None value when doing the stale surface generation technique in Chatterino7 as described in #74, very consistent --- src/server/event.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/event.rs b/src/server/event.rs index eaa1950..6f5e509 100644 --- a/src/server/event.rs +++ b/src/server/event.rs @@ -464,8 +464,11 @@ impl Event for client::wl_pointer::Event { warn!("could not enter surface: stale surface"); return; }; + let Some((surface, role, scale, window)) = query.get() else { + warn!("could not enter surface: stale surface"); + return; + }; - let (surface, role, scale, window) = query.get().unwrap(); cmd.insert(target, (*scale,)); let surface_is_popup = matches!(role, SurfaceRole::Popup(_));