godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix FileAccess last open error flag update

This commit is contained in:
bitsawer 2023-02-21 16:58:55 +02:00
parent 7e79aead99
commit c56058fe9a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/io/file_access.cpp
View File

@ -133,8 +133,8 @@ Ref<FileAccess> FileAccess::open_encrypted(const String &p_path, ModeFlags p_mod
Ref<FileAccessEncrypted> fae; Ref<FileAccessEncrypted> fae;
fae.instantiate(); fae.instantiate();
Error err = fae->open_and_parse(fa, p_key, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ); Error err = fae->open_and_parse(fa, p_key, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ);
if (err) {
last_file_open_error = err; last_file_open_error = err;
if (err) {
return Ref<FileAccess>(); return Ref<FileAccess>();
} }
return fae; return fae;
@ -149,8 +149,8 @@ Ref<FileAccess> FileAccess::open_encrypted_pass(const String &p_path, ModeFlags
Ref<FileAccessEncrypted> fae; Ref<FileAccessEncrypted> fae;
fae.instantiate(); fae.instantiate();
Error err = fae->open_and_parse_password(fa, p_pass, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ); Error err = fae->open_and_parse_password(fa, p_pass, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ);
if (err) {
last_file_open_error = err; last_file_open_error = err;
if (err) {
return Ref<FileAccess>(); return Ref<FileAccess>();
} }
return fae; return fae;
@ -161,9 +161,8 @@ Ref<FileAccess> FileAccess::open_compressed(const String &p_path, ModeFlags p_mo
fac.instantiate(); fac.instantiate();
fac->configure("GCPF", (Compression::Mode)p_compress_mode); fac->configure("GCPF", (Compression::Mode)p_compress_mode);
Error err = fac->open_internal(p_path, p_mode_flags); Error err = fac->open_internal(p_path, p_mode_flags);
if (err) {
last_file_open_error = err; last_file_open_error = err;
if (err) {
return Ref<FileAccess>(); return Ref<FileAccess>();
} }