diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-12 14:16:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 14:16:52 +0200 |
| commit | c28d7813445a897a371105ddb8f42ee68fafea0c (patch) | |
| tree | 29e4202a2b47505fe1dcfb0b6507cbb7f5d421e8 /core/io/file_access_compressed.cpp | |
| parent | 603b1315a711f427a581445c9680116bee0ef755 (diff) | |
| parent | d2ebac3a302f41223ab86f5bc2862dd3a050a010 (diff) | |
| download | redot-engine-c28d7813445a897a371105ddb8f42ee68fafea0c.tar.gz | |
Merge pull request #60169 from bruvzg/remove_fa_close
Diffstat (limited to 'core/io/file_access_compressed.cpp')
| -rw-r--r-- | core/io/file_access_compressed.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp index ebd729cc64..1d0a718166 100644 --- a/core/io/file_access_compressed.cpp +++ b/core/io/file_access_compressed.cpp @@ -97,10 +97,7 @@ Error FileAccessCompressed::open_after_magic(Ref<FileAccess> p_base) { Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) { ERR_FAIL_COND_V(p_mode_flags == READ_WRITE, ERR_UNAVAILABLE); - - if (f.is_valid()) { - close(); - } + _close(); Error err; f = FileAccess::open(p_path, p_mode_flags, &err); @@ -134,7 +131,7 @@ Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) { return OK; } -void FileAccessCompressed::close() { +void FileAccessCompressed::_close() { if (f.is_null()) { return; } @@ -373,7 +370,5 @@ Error FileAccessCompressed::_set_unix_permissions(const String &p_file, uint32_t } FileAccessCompressed::~FileAccessCompressed() { - if (f.is_valid()) { - close(); - } + _close(); } |