diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-16 21:03:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 21:03:09 +0100 |
| commit | d71c9f00050ce08917c06c2ec235bc09ea52f5a7 (patch) | |
| tree | e21b1f2f42e3cb0a1e022558c1eb6de6112e2b2a | |
| parent | 4c56fcd6cdf840b5aca05679674e24b2fea6a63c (diff) | |
| parent | 862e2df1a4cce500b7f18158de241b977036366b (diff) | |
Merge pull request #47065 from m4gr3d/fallback_to_text_project_godot
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; |