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

Merge branch 'main' into collab-panel

Browse Source
This commit is contained in:
Mikayla
2023-08-10 10:04:01 -07:00
parent b3447ada27 268f4b1939
commit b21b17c120
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/workspace.rs
+2 -2
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.
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)
}) {
if !close.await? {
if !should_close.await? {
return Ok(());
}
}
crates/zed/src/zed.rs
+3 -3
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.
for window in workspace_windows {
if let Some(close) = window.update_root(&mut cx, |workspace, cx| {
workspace.prepare_to_close(false, cx)
if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
workspace.prepare_to_close(true, cx)
}) {
if close.await? {
if !should_close.await? {
return Ok(());
}
}