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

Avoid flicker when moving between channels

Browse source
This commit is contained in:
Max Brunsfeld 2023-08-15 13:18:56 -07:00
parent 46928fa871
commit ddf3642d47
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,21 +279,17 @@ impl ActiveCall {
channel_id: u64,
cx: &mut ModelContext<Self>,
) -> Task<Result<()>> {
let leave_room;
if let Some(room) = self.room().cloned() {
if room.read(cx).channel_id() == Some(channel_id) {
return Task::ready(Ok(()));
} else {
leave_room = room.update(cx, |room, cx| room.leave(cx));
room.update(cx, |room, cx| room.clear_state(cx));
}
} else {
leave_room = Task::ready(Ok(()));
}
let join = Room::join_channel(channel_id, self.client.clone(), self.user_store.clone(), cx);
cx.spawn(|this, mut cx| async move {
leave_room.await?;
let room = join.await?;
this.update(&mut cx, |this, cx| this.set_room(Some(room.clone()), cx))
.await?;