Skip to content

Commit 7aa6f47

Browse files
regression: Fix a panic when removing git-containing worktree from the project panel (#15256)
Follow-up of #14989 Opening a project with git metadata and clicking "Remove from Project" will panic: ![image](https://github.com/user-attachments/assets/ba00dc55-d299-4edc-9a1f-01e92f0dd9ca) Release Notes: - N/A
1 parent 18daf17 commit 7aa6f47

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

crates/project/src/worktree_store.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,15 @@ impl WorktreeStore {
9696
pub fn remove_worktree(&mut self, id_to_remove: WorktreeId, cx: &mut ModelContext<Self>) {
9797
self.worktrees.retain(|worktree| {
9898
if let Some(worktree) = worktree.upgrade() {
99-
worktree.read(cx).id() != id_to_remove
99+
if worktree.read(cx).id() == id_to_remove {
100+
cx.emit(WorktreeStoreEvent::WorktreeRemoved(
101+
worktree.entity_id(),
102+
id_to_remove,
103+
));
104+
false
105+
} else {
106+
true
107+
}
100108
} else {
101109
false
102110
}

0 commit comments

Comments
 (0)