From 88202a567caa05b1e3a316845f226e149efe7354 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@icloud.com>
Date: Tue, 26 Jul 2022 16:22:07 -0700
Subject: [PATCH] Fixed regression in working directory code

---
 crates/terminal/src/terminal.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 4e5829559e..1dc4b0ddbf 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -335,7 +335,8 @@ fn get_working_directory(workspace: &Workspace, cx: &AppContext) -> Option<PathB
         .clone()
         .unwrap_or(WorkingDirectory::CurrentProjectDirectory);
     let res = match wd_setting {
-        WorkingDirectory::CurrentProjectDirectory => current_project_directory(workspace, cx),
+        WorkingDirectory::CurrentProjectDirectory => current_project_directory(workspace, cx)
+            .or_else(|| first_project_directory(workspace, cx)),
         WorkingDirectory::FirstProjectDirectory => first_project_directory(workspace, cx),
         WorkingDirectory::AlwaysHome => None,
         WorkingDirectory::Always { directory } => {