diff options
| author | Rémi Verschelde | 2018-02-21 09:07:47 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-02-22 12:19:43 +0100 |
| commit | f04cd405aca7c18cac28d8194d3267f8c1079dfe (patch) | |
| tree | 54fb0d593e61c878c53ba90ad1b2f602367bad4e /core | |
| parent | f55b376d7815bee578a84d50322766276b9a5727 (diff) | |
| download | godot-f04cd405aca7c18cac28d8194d3267f8c1079dfe.tar.gz godot-f04cd405aca7c18cac28d8194d3267f8c1079dfe.tar.zst godot-f04cd405aca7c18cac28d8194d3267f8c1079dfe.zip | |
Fix loading project.binary from PCK file
Regression introduced in #16825.
My logic was correct, but not the error code I was expecting.
The error reporting in FileAccess likely needs a review too.
(cherry picked from commit 57d562b394730649266f902db63d63b448dc1d6e)
Diffstat (limited to 'core')
| -rw-r--r-- | core/project_settings.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp index b7fd6d731..427fa77e6 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -453,8 +453,11 @@ Error ProjectSettings::_load_settings_text(const String p_path) { Error err; FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); - if (!f) - return ERR_CANT_OPEN; + if (!f) { + // FIXME: Above 'err' error code is ERR_FILE_CANT_OPEN if the file is missing + // This needs to be streamlined if we want decent error reporting + return ERR_FILE_NOT_FOUND; + } VariantParser::StreamFile stream; stream.f = f; @@ -513,6 +516,7 @@ Error ProjectSettings::_load_settings_text_or_binary(const String p_text_path, c return OK; } else if (err_text != ERR_FILE_NOT_FOUND) { // If the text-based file exists but can't be loaded, we want to know it + ERR_PRINTS("Couldn't load file '" + p_text_path + "', error code " + itos(err_text) + "."); return err_text; } |