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

Use AppContext instead of AsyncWindowContext to quit

Browse source 
Fixes refcell-related panic
This commit is contained in:
Piotr Osiewicz 2023-11-27 15:44:19 +01:00
parent a71180257d
commit 44876062c9
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/workspace2/src/workspace2.rs
View file

@ -479,7 +479,7 @@ pub trait CallHandler {
fn is_in_room(&self, cx: &mut ViewContext<Workspace>) -> bool {
self.room_id(cx).is_some()
}
fn hang_up(&self, cx: AsyncWindowContext) -> Result<Task<Result<()>>>;
fn hang_up(&self, cx: &mut AppContext) -> Task<Result<()>>;
fn active_project(&self, cx: &AppContext) -> Option<WeakModel<Project>>;
fn invite(
&mut self,
@ -1222,7 +1222,7 @@ impl Workspace {
if answer.await.log_err() == Some(1) {
return anyhow::Ok(false);
} else {
this.update(&mut cx, |this, cx| this.call_handler.hang_up(cx.to_async()))??
this.update(&mut cx, |this, cx| this.call_handler.hang_up(cx))?
.await
.log_err();
}