summaryrefslogtreecommitdiffstats
path: root/core/io/file_access_network.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-04-12 14:16:52 +0200
committerGitHub <noreply@github.com>2022-04-12 14:16:52 +0200
commitc28d7813445a897a371105ddb8f42ee68fafea0c (patch)
tree29e4202a2b47505fe1dcfb0b6507cbb7f5d421e8 /core/io/file_access_network.cpp
parent603b1315a711f427a581445c9680116bee0ef755 (diff)
parentd2ebac3a302f41223ab86f5bc2862dd3a050a010 (diff)
downloadredot-engine-c28d7813445a897a371105ddb8f42ee68fafea0c.tar.gz
Merge pull request #60169 from bruvzg/remove_fa_close
Diffstat (limited to 'core/io/file_access_network.cpp')
-rw-r--r--core/io/file_access_network.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 612181f8d5..1365b4b593 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -254,9 +254,8 @@ void FileAccessNetwork::_respond(uint64_t p_len, Error p_status) {
Error FileAccessNetwork::_open(const String &p_path, int p_mode_flags) {
ERR_FAIL_COND_V(p_mode_flags != READ, ERR_UNAVAILABLE);
- if (opened) {
- close();
- }
+ _close();
+
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
DEBUG_PRINT("open: " + p_path);
@@ -287,7 +286,7 @@ Error FileAccessNetwork::_open(const String &p_path, int p_mode_flags) {
return response;
}
-void FileAccessNetwork::close() {
+void FileAccessNetwork::_close() {
if (!opened) {
return;
}
@@ -483,7 +482,7 @@ FileAccessNetwork::FileAccessNetwork() {
}
FileAccessNetwork::~FileAccessNetwork() {
- close();
+ _close();
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
nc->lock_mutex();