On Wayland, fix WindowEvent::Destroyed delivery

CHANGELOG.md

@@ -12,6 +12,7 @@ Unreleased` header.
 # Unreleased
 
 - On Web, fix context menu not being disabled by `with_prevent_default(true)`.
+- On Wayland, fix `WindowEvent::Destroyed` not being delivered after destroying window.
 
 # 0.29.5
 

src/platform_impl/linux/wayland/event_loop/mod.rs

@@ -467,13 +467,14 @@ impl<T: 'static> EventLoop<T> {
         });
 
         for window_id in window_ids.drain(..) {
-            let request_redraw = self.with_state(|state| {
+            let event = self.with_state(|state| {
                 let window_requests = state.window_requests.get_mut();
                 if window_requests.get(&window_id).unwrap().take_closed() {
                     mem::drop(window_requests.remove(&window_id));
                     mem::drop(state.windows.get_mut().remove(&window_id));
-                    false
-                } else {
+                    return Some(WindowEvent::Destroyed);
+                }
+
                 let mut window = state
                     .windows
                     .get_mut()
@@ -483,8 +484,9 @@ impl<T: 'static> EventLoop<T> {
                     .unwrap();
 
                 if window.frame_callback_state() == FrameCallbackState::Requested {
-                        false
-                    } else {
+                    return None;
+                }
+
                 // Reset the frame callbacks state.
                 window.frame_callback_reset();
                 let mut redraw_requested = window_requests
@@ -495,16 +497,14 @@ impl<T: 'static> EventLoop<T> {
                 // Redraw the frame while at it.
                 redraw_requested |= window.refresh_frame();
 
-                        redraw_requested
-                    }
-                }
+                redraw_requested.then_some(WindowEvent::RedrawRequested)
             });
 
-            if request_redraw {
+            if let Some(event) = event {
                 callback(
                     Event::WindowEvent {
                         window_id: crate::window::WindowId(window_id),
-                        event: WindowEvent::RedrawRequested,
+                        event,
                     },
                     &self.window_target,
                 );