asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #73684 from bitsawer/fix_fileaccess_last_open_error

Browse source 
Fix FileAccess.get_open_error() flag update
This commit is contained in:
Rémi Verschelde 2023-02-21 23:34:49 +01:00
commit 35f0be2e92
No known key found for this signature in database
GPG key ID: C3336907360768E1
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;
fae.instantiate();
Error err = fae->open_and_parse(fa, p_key, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ);
last_file_open_error = err;
if (err) {
last_file_open_error = err;
return Ref<FileAccess>();
}
return fae;
@ -149,8 +149,8 @@ Ref<FileAccess> FileAccess::open_encrypted_pass(const String &p_path, ModeFlags
Ref<FileAccessEncrypted> fae;
fae.instantiate();
Error err = fae->open_and_parse_password(fa, p_pass, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ);
last_file_open_error = err;
if (err) {
last_file_open_error = err;
return Ref<FileAccess>();
}
return fae;
@ -161,9 +161,8 @@ Ref<FileAccess> FileAccess::open_compressed(const String &p_path, ModeFlags p_mo
fac.instantiate();
fac->configure("GCPF", (Compression::Mode)p_compress_mode);
Error err = fac->open_internal(p_path, p_mode_flags);
last_file_open_error = err;
if (err) {
last_file_open_error = err;
return Ref<FileAccess>();
}