On Wayland, fix rare crash on DPI change

While I don't understand the root cause for this issue, we can dirty fix like that for now.
rust-windowing · Mar 2, 2023 · 0be08e5 · 0be08e5
1 parent 811cc5c
commit 0be08e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ And please only add new entries to the top of this list, right below the `# Unre
 
 - Implement `HasRawDisplayHandle` for `EventLoop`.
 - On macOS, set resize increments only for live resizes.
+- On Wayland, fix rare crash on DPI change
 
 # 0.28.1
 

diff --git a/src/platform_impl/linux/wayland/window/mod.rs b/src/platform_impl/linux/wayland/window/mod.rs
@@ -128,6 +128,12 @@ impl Window {
                 let surface = event_loop_window_target
                     .env
                     .create_surface_with_scale_callback(move |scale, surface, mut dispatch_data| {
+                        // While I'm not sure how this could happen, we can safely ignore it
+                        // for now as a quickfix.
+                        if !surface.as_ref().is_alive() {
+                            return;
+                        }
+
                         let winit_state = dispatch_data.get::<WinitState>().unwrap();
 
                         // Get the window that received the event.