From f04cd405aca7c18cac28d8194d3267f8c1079dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 21 Feb 2018 09:07:47 +0100 Subject: [PATCH] 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) --- core/project_settings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/project_settings.cpp b/core/project_settings.cpp index b7fd6d7318e..427fa77e626 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; }