diff options
| author | George Marques <george@gmarqu.es> | 2021-04-07 14:32:26 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2021-04-08 09:35:06 -0300 |
| commit | b25ab27d4aeba4c4ac1fce4c818f2baa472687ab (patch) | |
| tree | 52d3c62debcbbc392eea9c8ba3b2270d58199b8d /core | |
| parent | c165814d36e14b74b1cfff8442c81ada17d8bef9 (diff) | |
Set resource path earlier on ProjectSettings setup
Since loading the config might use the resource path, it needs to be
set before that happens.
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index f87dc6704e..25dd408dce 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -467,16 +467,17 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b d->change_dir(p_path); String current_dir = d->get_current_dir(); - String candidate = current_dir; bool found = false; Error err; while (true) { + // Set the resource path early so things can be resolved when loading. + resource_path = current_dir; + resource_path = resource_path.replace("\\", "/"); // Windows path to Unix path just in case. err = _load_settings_text_or_binary(current_dir.plus_file("project.godot"), current_dir.plus_file("project.binary")); if (err == OK) { // Optional, we don't mind if it fails. _load_settings_text(current_dir.plus_file("override.cfg")); - candidate = current_dir; found = true; break; } @@ -493,8 +494,6 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b } } - resource_path = candidate; - resource_path = resource_path.replace("\\", "/"); // Windows path to Unix path just in case. memdelete(d); if (!found) { |