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

Merge branch 'main' into collab-panel

Browse source
This commit is contained in:
Mikayla 2023-08-10 10:04:01 -07:00
commit b21b17c120
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4086,10 +4086,10 @@ pub fn restart(_: &Restart, cx: &mut AppContext) {
// If the user cancels any save prompt, then keep the app open. // If the user cancels any save prompt, then keep the app open.
for window in workspace_windows { for window in workspace_windows {
if let Some(close) = window.update_root(&mut cx, |workspace, cx| { if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
workspace.prepare_to_close(true, cx) workspace.prepare_to_close(true, cx)
}) { }) {
if !close.await? { if !should_close.await? {
return Ok(()); return Ok(());
} }
} }

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

@ -432,10 +432,10 @@ fn quit(_: &Quit, cx: &mut gpui::AppContext) {
// If the user cancels any save prompt, then keep the app open. // If the user cancels any save prompt, then keep the app open.
for window in workspace_windows { for window in workspace_windows {
if let Some(close) = window.update_root(&mut cx, |workspace, cx| { if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
workspace.prepare_to_close(false, cx) workspace.prepare_to_close(true, cx)
}) { }) {
if close.await? { if !should_close.await? {
return Ok(()); return Ok(());
} }
} }