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

Fix panic due to re-entrantly reading Workspace

Browse source
This commit is contained in:
Antonio Scandurra 2023-04-28 12:36:50 +02:00
parent a978f3fe4f
commit 3763b985e3
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -134,9 +134,12 @@ impl View for CollabTitlebarItem {
}
impl CollabTitlebarItem {
pub fn new(workspace: &ViewHandle<Workspace>, cx: &mut ViewContext<Self>) -> Self {
pub fn new(
workspace: &ViewHandle<Workspace>,
user_store: ModelHandle<UserStore>,
cx: &mut ViewContext<Self>,
) -> Self {
let active_call = ActiveCall::global(cx);
let user_store = workspace.read(cx).user_store().clone();
let mut subscriptions = Vec::new();
subscriptions.push(cx.observe(workspace, |_, _, cx| cx.notify()));
subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx)));