From 5a15692589139484cac9703001743ab2c571a98d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 28 Sep 2023 17:04:05 -0700 Subject: [PATCH] :art: Workspace::leader_updated --- crates/workspace/src/workspace.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 404d974c52c7f3a7772c9ff197eab5ed98d1aab7..89dff882c368bb9567ff28eff80cfe0fa28a2488 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -3042,20 +3042,18 @@ impl Workspace { }; for (pane, state) in self.follower_states_by_leader.get(&leader_id)? { - let item = state - .active_view_id - .and_then(|id| state.items_by_leader_view_id.get(&id)); - let shared_screen = self.shared_screen_for_peer(leader_id, pane, cx); - if leader_in_this_app { + let item = state + .active_view_id + .and_then(|id| state.items_by_leader_view_id.get(&id)); if let Some(item) = item { if leader_in_this_project || !item.is_project_item(cx) { items_to_activate.push((pane.clone(), item.boxed_clone())); } - } else if let Some(shared_screen) = shared_screen { - items_to_activate.push((pane.clone(), Box::new(shared_screen))); + continue; } - } else if let Some(shared_screen) = shared_screen { + } + if let Some(shared_screen) = self.shared_screen_for_peer(leader_id, pane, cx) { items_to_activate.push((pane.clone(), Box::new(shared_screen))); } }