From 9b2d3fcd48dd35717ffc57cec46f968d44a1b773 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Mon, 8 May 2023 17:09:29 -0700
Subject: [PATCH] Fully remove panes and update internal data structures

---
 crates/workspace/src/persistence/model.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 08da41d7e8..ff027b6042 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -147,7 +147,14 @@ impl SerializedPaneGroup {
                 } else {
                     let pane = pane.upgrade(cx)?;
                     workspace
-                        .update(cx, |workspace, cx| workspace.remove_pane(pane, cx))
+                        .update(cx, |workspace, cx| {
+                            workspace.panes.retain(|p| p != &pane);
+                            cx.focus(workspace.panes.last().unwrap());
+                            if workspace.last_active_center_pane == Some(pane.downgrade()) {
+                                workspace.last_active_center_pane = None;
+                            }
+                            cx.notify();
+                        })
                         .log_err()?;
                     None
                 }