From 83004c1184d0d4e62d6108a24e3df69c06bdad84 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Thu, 7 Nov 2019 06:54:54 -0800 Subject: [PATCH] Options clearing fix, BeefBuild path fix --- BeefBuild/BeefSpace.toml | 2 +- BeefySysLib/platform/linux/BFPlatform.h | 1 + IDE/src/IDEApp.bf | 3 ++- IDE/src/ui/PropertiesDialog.bf | 7 +++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/BeefBuild/BeefSpace.toml b/BeefBuild/BeefSpace.toml index e3102f06..3f970596 100644 --- a/BeefBuild/BeefSpace.toml +++ b/BeefBuild/BeefSpace.toml @@ -1,5 +1,5 @@ FileVersion = 1 -Projects = {BeefBuild = {Path = "."}, corlib = {Path = "../IDE\\corlib"}, Beefy2D = {Path = "../BeefLibs/Beefy2D"}, IDEHelper = {Path = "../IDEHelper"}, Debugger64 = {Path = "../Debugger64"}, BeefySysLib = {Path = "../BeefySysLib"}} +Projects = {BeefBuild = {Path = "."}, corlib = "*", Beefy2D = {Path = "../BeefLibs/Beefy2D"}, IDEHelper = {Path = "../IDEHelper"}, Debugger64 = {Path = "../Debugger64"}, BeefySysLib = {Path = "../BeefySysLib"}} [Workspace] StartupProject = "BeefBuild" diff --git a/BeefySysLib/platform/linux/BFPlatform.h b/BeefySysLib/platform/linux/BFPlatform.h index 1c82a091..7b705c97 100644 --- a/BeefySysLib/platform/linux/BFPlatform.h +++ b/BeefySysLib/platform/linux/BFPlatform.h @@ -5,6 +5,7 @@ #include "LinuxCommon.h" #define BF_PLATFORM_LINUX +#define BF_PLATFORM_POSIX #define BF_PLATFORM_NAME "BF_PLATFORM_LINUX" #define BF_IMPORT extern "C" diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index 137f2801..c9088e65 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -3058,7 +3058,8 @@ namespace IDE { if (!mWorkspace.IsDebugSession) success &= SaveWorkspaceUserData(); - mSettings.Save(); + if (mSettings.mLoadedSettings) + mSettings.Save(); } MarkDirty(); diff --git a/IDE/src/ui/PropertiesDialog.bf b/IDE/src/ui/PropertiesDialog.bf index 80ad5957..aabff810 100644 --- a/IDE/src/ui/PropertiesDialog.bf +++ b/IDE/src/ui/PropertiesDialog.bf @@ -1665,13 +1665,12 @@ namespace IDE.ui Object target; if (!targetDict.TryGetValue(propEntry.mTarget, out target)) { - Debug.FatalError(); - //continue; + //Debug.FatalError(); + continue; } String usePropName = scope:: String(propEntry.mPropertyName); - //String[] useOptionValues = optionValues; - + while (true) { int dotIdx = usePropName.IndexOf('.');