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

Fix prompting the user to hang up when opening a workspace (#7408)

Browse source 
Before this change if you had joined a call with an empty workspace,
then we'd prompt you to hang up when you tried to open a recent project.



Release Notes:

- Fixed an erroneous prompt to "hang up" when opening a new project from
an empty workspace.
This commit is contained in:
Conrad Irwin 2024-02-05 15:21:18 -07:00 • committed by GitHub
parent 1a40c9f0f2
commit d04a286634
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/workspace/src/workspace.rs
View file

@ -1345,22 +1345,14 @@ impl Workspace {
let is_remote = self.project.read(cx).is_remote(); let is_remote = self.project.read(cx).is_remote();
let has_worktree = self.project.read(cx).worktrees().next().is_some(); let has_worktree = self.project.read(cx).worktrees().next().is_some();
let has_dirty_items = self.items(cx).any(|item| item.is_dirty(cx)); let has_dirty_items = self.items(cx).any(|item| item.is_dirty(cx));
let close_task = if is_remote || has_worktree || has_dirty_items { let window_to_replace = if is_remote || has_worktree || has_dirty_items {
None None
} else { } else {
Some(self.prepare_to_close(false, cx)) window
}; };
let app_state = self.app_state.clone(); let app_state = self.app_state.clone();
cx.spawn(|_, mut cx| async move { cx.spawn(|_, mut cx| async move {
let window_to_replace = if let Some(close_task) = close_task {
if !close_task.await? {
return Ok(());
}
window
} else {
None
};
cx.update(|cx| open_paths(&paths, &app_state, window_to_replace, cx))? cx.update(|cx| open_paths(&paths, &app_state, window_to_replace, cx))?
.await?; .await?;
Ok(()) Ok(())