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

Fix Invalid Task ID errors in ResourceLoader.

Browse Source 
(cherry picked from commit d1b63ae16c)
This commit is contained in:
Pāvels Nadtočajevs
2025-03-13 08:41:53 +02:00
committed by Rémi Verschelde
parent 11c7d225fa
commit b56668fd12
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/io/resource_loader.cpp
View File

@ -264,6 +264,14 @@ void ResourceLoader::LoadToken::clear() {
thread_load_tasks.erase(local_path); thread_load_tasks.erase(local_path);
} }
local_path.clear(); // Mark as already cleared. local_path.clear(); // Mark as already cleared.
if (task_to_await) {
for (KeyValue<String, ResourceLoader::ThreadLoadTask> &E : thread_load_tasks) {
if (E.value.task_id == task_to_await) {
task_to_await = 0;
break; // Same task is reused by nested loads, do not wait for completion here.
}
}
}
} }
} }
@ -829,6 +837,12 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
p_thread_load_lock.temp_relock(); p_thread_load_lock.temp_relock();
load_task.awaited = true; load_task.awaited = true;
// Mark nested loads with the same task id as awaited.
for (KeyValue<String, ResourceLoader::ThreadLoadTask> &E : thread_load_tasks) {
if (E.value.task_id == load_task.task_id) {
E.value.awaited = true;
}
}
DEV_ASSERT(load_task.status == THREAD_LOAD_FAILED || load_task.status == THREAD_LOAD_LOADED); DEV_ASSERT(load_task.status == THREAD_LOAD_FAILED || load_task.status == THREAD_LOAD_LOADED);
} else if (load_task.need_wait) { } else if (load_task.need_wait) {