godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 57d562b394)
This commit is contained in:
Rémi Verschelde 2018-02-21 09:07:47 +01:00 committed by Hein-Pieter van Braam
parent f55b376d78
commit f04cd405ac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/project_settings.cpp
View File

@ -453,8 +453,11 @@ Error ProjectSettings::_load_settings_text(const String p_path) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
if (!f) if (!f) {
return ERR_CANT_OPEN; // 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; VariantParser::StreamFile stream;
stream.f = f; stream.f = f;
@ -513,6 +516,7 @@ Error ProjectSettings::_load_settings_text_or_binary(const String p_text_path, c
return OK; return OK;
} else if (err_text != ERR_FILE_NOT_FOUND) { } else if (err_text != ERR_FILE_NOT_FOUND) {
// If the text-based file exists but can't be loaded, we want to know it // 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; return err_text;
} }