diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-25 16:21:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 16:21:09 +0200 |
| commit | 68ee73077415a7377bf460c1199067a4b5ef82ab (patch) | |
| tree | d1ab387a2edf5ab45229e65debb4181ac34a9c4a | |
| parent | 02bb8e948fb7ce230d9b293ffc362d305d08538c (diff) | |
| parent | caf8e5e3396f7210c11757874e48af641f924c17 (diff) | |
Merge pull request #60424 from timothyqiu/fa-unref
Close `FileAccess` before accessing it with `DirAccess`
| -rw-r--r-- | core/io/resource_format_binary.cpp | 4 | ||||
| -rw-r--r-- | scene/resources/resource_format_text.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 8d4dbc3f73..b6988109c5 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -1153,6 +1153,8 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons uint32_t ver_format = f->get_32(); if (ver_format < FORMAT_VERSION_CAN_RENAME_DEPS) { + fw.unref(); + { Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); da->remove(p_path + ".depren"); @@ -1295,6 +1297,8 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons return ERR_CANT_CREATE; } + fw.unref(); + Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES); da->remove(p_path); da->rename(p_path + ".depren", p_path); diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 4b0456681b..b18456d464 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -898,6 +898,8 @@ Error ResourceLoaderText::rename_dependencies(Ref<FileAccess> p_f, const String return ERR_CANT_CREATE; } + fw.unref(); + Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES); da->remove(p_path); da->rename(p_path + ".depren", p_path); |