From 24a48fdac67d552b77baa3e8e2b06b517f3a7ea3 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Thu, 3 Jul 2025 16:10:54 +0200
Subject: [PATCH] shell: Fix re-render on `toplevel_destroy`

---
 src/wayland/handlers/xdg_shell/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wayland/handlers/xdg_shell/mod.rs b/src/wayland/handlers/xdg_shell/mod.rs
index 5f640c39..b4857576 100644
--- a/src/wayland/handlers/xdg_shell/mod.rs
+++ b/src/wayland/handlers/xdg_shell/mod.rs
@@ -274,15 +274,15 @@ impl XdgShellHandler for State {
         let (output, clients) = {
             let mut shell = self.common.shell.write();
             let seat = shell.seats.last_active().clone();
+
+            let output = shell
+                .visible_output_for_surface(surface.wl_surface())
+                .cloned();
             shell.unmap_surface(
                 surface.wl_surface(),
                 &seat,
                 &mut self.common.toplevel_info_state,
             );
-
-            let output = shell
-                .visible_output_for_surface(surface.wl_surface())
-                .cloned();
             if let Some(output) = output.as_ref() {
                 shell.refresh_active_space(output);
             }