Merge branch 'main' into collab-panel

Mikayla created 2 years ago

Change summary

crates/workspace/src/workspace.rs | 4 ++--
crates/zed/src/zed.rs             | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

crates/workspace/src/workspace.rs

@@ -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

@@ -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(());
                 }
             }