mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 02:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Restore synchronization

Browse source
This commit is contained in:
Mikayla 2023-10-21 03:08:25 -07:00
parent 5365fd2149
commit 7e4de2ac16
No known key found for this signature in database
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/call/src/call.rs
View file

@ -289,12 +289,13 @@ impl ActiveCall {
let room_id = call.room_id.clone(); let room_id = call.room_id.clone();
let client = self.client.clone(); let client = self.client.clone();
let user_store = self.user_store.clone(); let user_store = self.user_store.clone();
let join = let join = self
cx.spawn(|this, cx| async move { Room::join(room_id, client, user_store, cx).await }); ._join_debouncer
.spawn(cx, move |cx| Room::join(room_id, client, user_store, cx));
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let room = join.await?; let room = join.await?;
this.update(&mut cx, |this, cx| this.set_room(Some(room.clone()), cx)) this.update(&mut cx, |this, cx| this.set_room(room.clone(), cx))
.await?; .await?;
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.report_call_event("accept incoming", cx) this.report_call_event("accept incoming", cx)
@ -332,20 +333,18 @@ impl ActiveCall {
let client = self.client.clone(); let client = self.client.clone();
let user_store = self.user_store.clone(); let user_store = self.user_store.clone();
let join = cx.spawn(|this, cx| async move { let join = self._join_debouncer.spawn(cx, move |cx| async move {
Room::join_channel(channel_id, client, user_store, cx).await Room::join_channel(channel_id, client, user_store, cx).await
}); });
// self._join_debouncer.spawn(cx, move |cx| async move {});
cx.spawn(move |this, mut cx| async move { cx.spawn(move |this, mut cx| async move {
let room = join.await?; let room = join.await?;
this.update(&mut cx, |this, cx| this.set_room(Some(room.clone()), cx)) this.update(&mut cx, |this, cx| this.set_room(room.clone(), cx))
.await?; .await?;
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.report_call_event("join channel", cx) this.report_call_event("join channel", cx)
}); });
Ok(Some(room)) Ok(room)
}) })
} }