Skip to content

Commit

Permalink
Fix loading project.binary from PCK file
Browse files Browse the repository at this point in the history
Regression introduced in godotengine#16825.
My logic was correct, but not the error code I was expecting.
The error reporting in FileAccess likely needs a review too.
  • Loading branch information
akien-mga committed Feb 21, 2018
1 parent 53a2b0a commit 57d562b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions core/project_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 57d562b

Please sign in to comment.