oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leave the room if there's a pending room update

Browse Source
This commit is contained in:
Antonio Scandurra
2022-10-07 14:52:39 +02:00
parent 251e06c50f
commit 560d8a8004
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/call/src/room.rs
+5 -3
View File
@@ -26,7 +26,7 @@ pub struct Room {
client: Arc<Client>, client: Arc<Client>,
user_store: ModelHandle<UserStore>, user_store: ModelHandle<UserStore>,
subscriptions: Vec<client::Subscription>, subscriptions: Vec<client::Subscription>,
_pending_room_update: Option<Task<()>>, pending_room_update: Option<Task<()>>,
} }
impl Entity for Room { impl Entity for Room {
@@ -67,7 +67,7 @@ impl Room {
pending_call_count: 0, pending_call_count: 0,
subscriptions: vec![client.add_message_handler(cx.handle(), Self::handle_room_updated)], subscriptions: vec![client.add_message_handler(cx.handle(), Self::handle_room_updated)],
leave_when_empty: false, leave_when_empty: false,
_pending_room_update: None, pending_room_update: None,
client, client,
user_store, user_store,
} }
@@ -130,6 +130,7 @@ impl Room {
fn should_leave(&self) -> bool { fn should_leave(&self) -> bool {
self.leave_when_empty self.leave_when_empty
&& self.pending_room_update.is_none()
&& self.pending_users.is_empty() && self.pending_users.is_empty()
&& self.remote_participants.is_empty() && self.remote_participants.is_empty()
&& self.pending_call_count == 0 && self.pending_call_count == 0
@@ -197,7 +198,7 @@ impl Room {
user_store.get_users(room.pending_user_ids, cx), user_store.get_users(room.pending_user_ids, cx),
) )
}); });
self._pending_room_update = Some(cx.spawn(|this, mut cx| async move { self.pending_room_update = Some(cx.spawn(|this, mut cx| async move {
let (participants, pending_users) = futures::join!(participants, pending_users); let (participants, pending_users) = futures::join!(participants, pending_users);
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
@@ -249,6 +250,7 @@ impl Room {
cx.notify(); cx.notify();
} }
this.pending_room_update.take();
if this.should_leave() { if this.should_leave() {
let _ = this.leave(cx); let _ = this.leave(cx);
} }