From 1a164b166f8f8e1837839ed00a499e316b47c078 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Wed, 1 Jun 2022 14:55:47 -0700
Subject: [PATCH] Fixed -workspace arg which includes BeefSpace.toml name

---
 IDE/src/IDEApp.bf | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index c6e6decb..6c535e92 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -2898,11 +2898,15 @@ namespace IDE
 
 		public void GetRelaunchCmd(bool safeMode, String outRelaunchCmd)
 		{
-			outRelaunchCmd.Append("\"");
-			Environment.GetExecutableFilePath(outRelaunchCmd);
-			outRelaunchCmd.Append("\" -workspace=\"");
-			outRelaunchCmd.Append(mWorkspace.mDir);
-			outRelaunchCmd.Append("\"");
+			if (mWorkspace.mDir != null)
+			{
+				outRelaunchCmd.Append("\"");
+				Environment.GetExecutableFilePath(outRelaunchCmd);
+				outRelaunchCmd.Append("\" -workspace=\"");
+				outRelaunchCmd.Append(mWorkspace.mDir);
+				outRelaunchCmd.Append("\"");
+			}
+
 			if (safeMode)
 				outRelaunchCmd.Append(" -safe");
 		}
@@ -7541,6 +7545,9 @@ namespace IDE
 					String fullDir = new String();
 					Path.GetFullPath(relDir, fullDir);
 
+					if (fullDir.EndsWith("BeefSpace.toml", .OrdinalIgnoreCase))
+						fullDir.RemoveFromEnd("BeefSpace.toml".Length);
+
 					if ((File.Exists(fullDir)) || (IsBeefFile(fullDir)))
 					{
 						mWorkspace.mCompositeFile = new CompositeFile(fullDir);