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

Merge pull request #73616 from voidedWarranties/resourcecache_thread_safe 

Make `ResourceCache::get_cached_resources` thread-safe
This commit is contained in:
Rémi Verschelde 2023-02-20 11:29:08 +01:00
parent 4cd2aec2f0 c586835541
commit 32a29977fb
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/io/resource.cpp
View File

@ -542,9 +542,26 @@ Ref<Resource> ResourceCache::get_ref(const String &p_path) {
void ResourceCache::get_cached_resources(List<Ref<Resource>> *p_resources) { void ResourceCache::get_cached_resources(List<Ref<Resource>> *p_resources) {
lock.lock(); lock.lock();
LocalVector<String> to_remove;
for (KeyValue<String, Resource *> &E : resources) { for (KeyValue<String, Resource *> &E : resources) {
p_resources->push_back(Ref<Resource>(E.value)); Ref<Resource> ref = Ref<Resource>(E.value);
if (!ref.is_valid()) {
// This resource is in the process of being deleted, ignore its existence
E.value->path_cache = String();
to_remove.push_back(E.key);
continue;
}
p_resources->push_back(ref);
} }
for (const String &E : to_remove) {
resources.erase(E);
}
lock.unlock(); lock.unlock();
} }