Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash in resource load

Browse source 
(cherry picked from commit 047671df0f)
This commit is contained in:
Pedro J. Estébanez 2023-03-01 11:11:40 +01:00 • committed by Yuri Sizov
parent a94a2062af
commit 46d475b067
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/io/resource_loader.cpp
View file

@ -492,13 +492,21 @@ Ref<Resource> ResourceLoader::load_threaded_get(const String &p_path, Error *r_e
print_lt("GET: load count: " + itos(thread_loading_count) + " / wait count: " + itos(thread_waiting_count) + " / suspended count: " + itos(thread_suspended_count) + " / active: " + itos(thread_loading_count - thread_suspended_count)); print_lt("GET: load count: " + itos(thread_loading_count) + " / wait count: " + itos(thread_waiting_count) + " / suspended count: " + itos(thread_suspended_count) + " / active: " + itos(thread_loading_count - thread_suspended_count));
} }
bool still_valid = true;
bool was_thread = load_task.thread;
do { do {
load_task.cond_var->wait(thread_load_lock); load_task.cond_var->wait(thread_load_lock);
if (!thread_load_tasks.has(local_path)) { //may have been erased during unlock and this was always an invalid call
still_valid = false;
break;
}
} while (load_task.cond_var); // In case of spurious wakeup. } while (load_task.cond_var); // In case of spurious wakeup.
thread_suspended_count--; if (was_thread) {
thread_suspended_count--;
}
if (!thread_load_tasks.has(local_path)) { //may have been erased during unlock and this was always an invalid call if (!still_valid) {
if (r_error) { if (r_error) {
*r_error = ERR_INVALID_PARAMETER; *r_error = ERR_INVALID_PARAMETER;
} }