diff options
| author | Fredia Huya-Kouadio <fhuya@google.com> | 2021-03-15 16:46:14 -0700 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2021-03-16 09:38:35 -0700 |
| commit | 862e2df1a4cce500b7f18158de241b977036366b (patch) | |
| tree | 8756049465e15cded1a9717c1fb33686bc927968 | |
| parent | 224f5cab992e10fa1d197785942e60032b269577 (diff) | |
Fix bug causing `project.godot` to be ignored when `project.binary` is missing
| -rw-r--r-- | core/config/project_settings.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index f7a6a8ece0..f87dc6704e 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -643,7 +643,6 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path, } else if (err != ERR_FILE_NOT_FOUND) { // If the file exists but can't be loaded, we want to know it. ERR_PRINT("Couldn't load file '" + p_bin_path + "', error code " + itos(err) + "."); - return err; } // Fallback to text-based project.godot file if binary was not found. @@ -652,7 +651,6 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path, return OK; } else if (err != ERR_FILE_NOT_FOUND) { ERR_PRINT("Couldn't load file '" + p_text_path + "', error code " + itos(err) + "."); - return err; } return err; |