diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-10 07:45:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 07:45:24 +0100 |
| commit | eef1e3bb985e28c90893ea64d5ed4598814c9427 (patch) | |
| tree | 592ff2dd404dbe42b12c3917328030ad5353634c /modules/mono | |
| parent | 192a4d7de5c557bdfe83bd180cd603d7e280ebd4 (diff) | |
| parent | c57fc8ee7df9113be6c0857ceff51bfed5b9f8bd (diff) | |
Merge pull request #12470 from djrm/pr_fix_editor_settings
Fixed editor settings disappearing.
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 12 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index a26f36d64f..24247ed3b4 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -365,16 +365,14 @@ GodotSharpBuilds::GodotSharpBuilds() { // Build tool settings EditorSettings *ed_settings = EditorSettings::get_singleton(); - if (!ed_settings->has_setting("mono/builds/build_tool")) { - ed_settings->set_setting("mono/builds/build_tool", + EDITOR_DEF("mono/builds/build_tool", #ifdef WINDOWS_ENABLED - // TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version - MSBUILD + // TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version + MSBUILD #else - MSBUILD_MONO + MSBUILD_MONO #endif - ); - } + ); ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM, #ifdef WINDOWS_ENABLED "MSBuild (Mono),MSBuild (System)" diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index 837dbfde66..1bc1e8a515 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -221,9 +221,7 @@ GodotSharpEditor::GodotSharpEditor(EditorNode *p_editor) { // External editor settings EditorSettings *ed_settings = EditorSettings::get_singleton(); - if (!ed_settings->has_setting("mono/editor/external_editor")) { - ed_settings->set_setting("mono/editor/external_editor", EDITOR_NONE); - } + EDITOR_DEF("mono/editor/external_editor", EDITOR_NONE); ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/editor/external_editor", PROPERTY_HINT_ENUM, "None,MonoDevelop,Visual Studio Code")); } |