Implement WindowContext::remove_window

2023-11-02 13:37:55 +01:00 · 2023-11-02 13:37:55 +01:00 · c1ca7ad41d
commit c1ca7ad41d
parent 089bf58934
3 changed files with 15 additions and 6 deletions
--- a/crates/gpui2/src/app.rs
+++ b/crates/gpui2/src/app.rs
@ -789,10 +789,13 @@ impl Context for AppContext {

            let root_view = window.root_view.clone().unwrap();
            let result = update(root_view, &mut WindowContext::new(cx, &mut window));
-            cx.windows
-                .get_mut(handle.id)
-                .ok_or_else(|| anyhow!("window not found"))?
-                .replace(window);
+
+            if !window.removed {
+                cx.windows
+                    .get_mut(handle.id)
+                    .ok_or_else(|| anyhow!("window not found"))?
+                    .replace(window);
+            }

            Ok(result)
        })