Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid leaking docks when adding panels

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-22 18:57:14 +02:00
parent 75a0742c90
commit 3ca95678f1
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/workspace/src/workspace.rs
View file

@ -477,7 +477,7 @@ pub struct Workspace {
leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>, leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
database_id: WorkspaceId, database_id: WorkspaceId,
app_state: Arc<AppState>, app_state: Arc<AppState>,
_subscriptions: Vec<Subscription>, subscriptions: Vec<Subscription>,
_apply_leader_updates: Task<Result<()>>, _apply_leader_updates: Task<Result<()>>,
_observe_current_user: Task<Result<()>>, _observe_current_user: Task<Result<()>>,
pane_history_timestamp: Arc<AtomicUsize>, pane_history_timestamp: Arc<AtomicUsize>,
@ -683,7 +683,7 @@ impl Workspace {
_observe_current_user, _observe_current_user,
_apply_leader_updates, _apply_leader_updates,
leader_updates_tx, leader_updates_tx,
_subscriptions: subscriptions, subscriptions,
pane_history_timestamp, pane_history_timestamp,
}; };
this.project_remote_id_changed(project.read(cx).remote_id(), cx); this.project_remote_id_changed(project.read(cx).remote_id(), cx);
@ -846,7 +846,7 @@ impl Workspace {
DockPosition::Right => &self.right_dock, DockPosition::Right => &self.right_dock,
}; };
cx.subscribe(&panel, { self.subscriptions.push(cx.subscribe(&panel, {
let mut dock = dock.clone(); let mut dock = dock.clone();
let mut prev_position = panel.position(cx); let mut prev_position = panel.position(cx);
move |this, panel, event, cx| { move |this, panel, event, cx| {
@ -884,8 +884,7 @@ impl Workspace {
cx.notify(); cx.notify();
} }
} }
}) }));
.detach();
dock.update(cx, |dock, cx| dock.add_panel(panel, cx)); dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
} }