Don't prompt to leave a call you're not in

zed-industries · Feb 12, 2024 · 2029ede · 2029ede
1 parent 382304f
commit 2029ede
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
@@ -1217,7 +1217,9 @@ impl Workspace {
             if let Some(active_call) = active_call {
                 if !quitting
                     && workspace_count == 1
-                    && active_call.read_with(&cx, |call, _| call.room().is_some())?
+                    && active_call.read_with(&cx, |call, cx| {
+                        call.room().is_some_and(|room| room.read(cx).in_call())
+                    })?
                 {
                     let answer = window.update(&mut cx, |_, cx| {
                         cx.prompt(
@@ -1230,12 +1232,11 @@ impl Workspace {
 
                     if answer.await.log_err() == Some(1) {
                         return anyhow::Ok(false);
-                    } else {
-                        active_call
-                            .update(&mut cx, |call, cx| call.hang_up(cx))?
-                            .await
-                            .log_err();
                     }
+                    active_call
+                        .update(&mut cx, |call, cx| call.hang_up(cx))?
+                        .await
+                        .log_err();
                 }
             }