godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91897 from RandomShaper/res_unreg_if_true 

Add an identity check to resource unregistration from cache
This commit is contained in:
Rémi Verschelde 2024-05-16 09:32:03 +02:00
parent c27f24da81 b70afac286
commit 944b95e1a5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/io/resource.cpp
View File

@ -569,11 +569,18 @@ Resource::Resource() :
remapped_list(this) {} remapped_list(this) {}
Resource::~Resource() { Resource::~Resource() {
if (!path_cache.is_empty()) { if (unlikely(path_cache.is_empty())) {
ResourceCache::lock.lock(); return;
ResourceCache::resources.erase(path_cache);
ResourceCache::lock.unlock();
} }
ResourceCache::lock.lock();
// Only unregister from the cache if this is the actual resource listed there.
// (Other resources can have the same value in `path_cache` if loaded with `CACHE_IGNORE`.)
HashMap<String, Resource *>::Iterator E = ResourceCache::resources.find(path_cache);
if (likely(E && E->value == this)) {
ResourceCache::resources.remove(E);
}
ResourceCache::lock.unlock();
} }
HashMap<String, Resource *> ResourceCache::resources; HashMap<String, Resource *> ResourceCache::resources;