diff options
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 8 | ||||
| -rw-r--r-- | modules/mono/glue/Managed/Files/Colors.cs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index cce86efbf5..a1f4bb3c4c 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -251,6 +251,14 @@ Error GodotSharpEditor::open_in_external_editor(const Ref<Script> &p_script, int // Try to search it again if it wasn't found last time or if it was removed from its location vscode_path = path_which("code"); } + if (vscode_path.empty() || !FileAccess::exists(vscode_path)) { + // On some Linux distro the executable has the name vscode + vscode_path = path_which("vscode"); + } + if (vscode_path.empty() || !FileAccess::exists(vscode_path)) { + // Executable name when installing VSCode directly from MS on Linux + vscode_path = path_which("visual-studio-code"); + } List<String> args; diff --git a/modules/mono/glue/Managed/Files/Colors.cs b/modules/mono/glue/Managed/Files/Colors.cs index 942375b0fe..bc2a1a3bd7 100644 --- a/modules/mono/glue/Managed/Files/Colors.cs +++ b/modules/mono/glue/Managed/Files/Colors.cs @@ -8,7 +8,7 @@ namespace Godot // Color names and values are derived from core/color_names.inc internal static readonly Dictionary<string, Color> namedColors = new Dictionary<string, Color> { {"aliceblue", new Color(0.94f, 0.97f, 1.00f)}, - {"antiqueWhite", new Color(0.98f, 0.92f, 0.84f)}, + {"antiquewhite", new Color(0.98f, 0.92f, 0.84f)}, {"aqua", new Color(0.00f, 1.00f, 1.00f)}, {"aquamarine", new Color(0.50f, 1.00f, 0.83f)}, {"azure", new Color(0.94f, 1.00f, 1.00f)}, |