mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix double borrow error when closing an item

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-18 10:13:50 +01:00
parent 4f472e1442
commit b7091dd5e2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/workspace/src/pane.rs
View file

@ -316,6 +316,10 @@ impl Pane {
let mut item_ix = 0; let mut item_ix = 0;
self.item_views.retain(|(_, item_view)| { self.item_views.retain(|(_, item_view)| {
if item_view.id() == item_view_id { if item_view.id() == item_view_id {
if item_ix == self.active_item_index {
item_view.deactivated(cx);
}
let mut navigation = self.navigation.0.borrow_mut(); let mut navigation = self.navigation.0.borrow_mut();
if let Some(path) = item_view.project_path(cx) { if let Some(path) = item_view.project_path(cx) {
navigation.paths_by_item.insert(item_view.id(), path); navigation.paths_by_item.insert(item_view.id(), path);
@ -323,9 +327,6 @@ impl Pane {
navigation.paths_by_item.remove(&item_view.id()); navigation.paths_by_item.remove(&item_view.id());
} }
if item_ix == self.active_item_index {
item_view.deactivated(cx);
}
item_ix += 1; item_ix += 1;
false false
} else { } else {