Fix warning: Property not found: mono/editor/editor_path_optional (go…

…dotengine#36995)
akien-mga · Mar 21, 2020 · 05946be · 05946be
1 parent cce0a27
commit 05946be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs
@@ -251,7 +251,7 @@ public static void Initialize()
             var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
             var msbuild = BuildTool.MsBuildMono;
             if (OS.IsWindows)
-                msbuild = RiderPathManager.IsRider((string) editorSettings.GetSetting(RiderPathManager.EditorPathSettingName))
+                msbuild = RiderPathManager.IsExternalEditorSetToRider(editorSettings)
                         ? BuildTool.JetBrainsMsBuild
                         : BuildTool.MsBuildVs;
 

diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
@@ -55,6 +55,11 @@ public static void Initialize()
             }
         }
 
+        public static bool IsExternalEditorSetToRider(EditorSettings editorSettings)
+        {
+            return editorSettings.HasSetting(EditorPathSettingName) && IsRider((string) editorSettings.GetSetting(EditorPathSettingName));
+        }
+
         public static bool IsRider(string path)
         {
             if (string.IsNullOrEmpty(path))