diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-21 23:34:49 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-21 23:34:49 +0100 |
| commit | 35f0be2e92906a6d18a110ae371c247a3eab1a13 (patch) | |
| tree | 014c8c8993ceeb33f6cdce5cc33b34ac2064eec0 /core | |
| parent | 253396ba3933b3c1b5a91016ac3eb1fb90788a9d (diff) | |
| parent | c56058fe9a658eed8fd001bef6fc06a17aeeb708 (diff) | |
Merge pull request #73684 from bitsawer/fix_fileaccess_last_open_error
Fix FileAccess.get_open_error() flag update
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/file_access.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/io/file_access.cpp b/core/io/file_access.cpp index 0e9084de84..3d10151327 100644 --- a/core/io/file_access.cpp +++ b/core/io/file_access.cpp @@ -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>(); } |