summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-02-09 12:26:18 +0200
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-02-09 12:26:18 +0200
commit27bb6b5282ee62ade086f840ec78ca65d31c081d (patch)
treef9bab41a2f16f0ffddeb48ca8273b57879be9add
parentb19c9bd1983b8c72621595b7c22daade4ebf6625 (diff)
Make _sc_ files work like ._sc_, fixes #7762
-rw-r--r--tools/editor/editor_settings.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 1cdc426541..dcca89a275 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -242,13 +242,20 @@ void EditorSettings::create() {
String exe_path = OS::get_singleton()->get_executable_path().get_base_dir();
DirAccess* d = DirAccess::create_for_path(exe_path);
+ bool self_contained = false;
if (d->file_exists(exe_path + "/._sc_")) {
+ self_contained = true;
+ extra_config->load(exe_path + "/._sc_");
+ } else if (d->file_exists(exe_path + "/_sc_")) {
+ self_contained = true;
+ extra_config->load(exe_path + "/_sc_");
+ }
+ if (self_contained) {
// editor is self contained
config_path = exe_path;
config_dir = "editor_data";
- extra_config->load(exe_path + "/._sc_");
} else {
if (OS::get_singleton()->has_environment("APPDATA")) {