Fix error reporting when opening pack files

Author: nikitalita

core/io/file_access.cpp

@@ -159,19 +159,24 @@ Error FileAccess::reopen(const String &p_path, int p_mode_flags) {
 Ref<FileAccess> FileAccess::open(const String &p_path, int p_mode_flags, Error *r_error) {
 	//try packed data first
 
+	Error err = OK;
 	Ref<FileAccess> ret;
 	if (!(p_mode_flags & WRITE) && !(p_mode_flags & SKIP_PACK) && PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled()) {
 		ret = PackedData::get_singleton()->try_open_path(p_path);
 		if (ret.is_valid()) {
+			err = ret->get_error();
 			if (r_error) {
-				*r_error = OK;
+				*r_error = err;
+			}
+			if (err != OK) {
+				ret.unref();
 			}
 			return ret;
 		}
 	}
 
 	ret = create_for_path(p_path);
-	Error err = ret->open_internal(p_path, p_mode_flags & ~SKIP_PACK);
+	err = ret->open_internal(p_path, p_mode_flags & ~SKIP_PACK);
 
 	if (r_error) {
 		*r_error = err;

core/io/file_access_pack.cpp

@@ -447,7 +447,11 @@ void FileAccessPack::set_big_endian(bool p_big_endian) {
 }
 
 Error FileAccessPack::get_error() const {
-	if (eof) {
+	if (encryption_error) {
+		return ERR_UNAUTHORIZED;
+	} else if (f.is_null()) {
+		return ERR_FILE_CANT_OPEN;
+	} else if (eof) {
 		return ERR_FILE_EOF;
 	}
 	return OK;
@@ -471,6 +475,7 @@ void FileAccessPack::close() {
 
 FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file) {
 	pf = p_file;
+	eof = true;
 	if (pf.bundle) {
 		String simplified_path = p_path.simplify_path();
 		f = FileAccess::open(simplified_path, FileAccess::READ | FileAccess::SKIP_PACK);
@@ -495,6 +500,7 @@ FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFil
 		}
 
 		Error err = fae->open_and_parse(f, key, FileAccessEncrypted::MODE_READ, false);
+		encryption_error = err != OK;
 		ERR_FAIL_COND_MSG(err, vformat("Can't open encrypted pack-referenced file '%s'.", String(pf.pack)));
 		f = fae;
 		off = 0;

core/io/file_access_pack.h

@@ -168,6 +168,7 @@ class FileAccessPack : public FileAccess {
 
 	mutable uint64_t pos;
 	mutable bool eof;
+	bool encryption_error = false;
 	uint64_t off;
 
 	Ref<FileAccess> f;