diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-08 19:13:36 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-08 19:13:36 +0200 |
| commit | f85b1e4e3afdfb7a28432e3b38f16faf0e8833ee (patch) | |
| tree | b6ddc1e727855aeef5ef7d0601cf588c6d21d52c | |
| parent | 40d9f3a158649d0dfc53555a695c33b99409d3cf (diff) | |
| parent | a426479b3f2594bc148e02f3f1e1dca1b4c5e97b (diff) | |
| download | redot-engine-f85b1e4e3afdfb7a28432e3b38f16faf0e8833ee.tar.gz | |
Merge pull request #94070 from RandomShaper/fix_wtp_rl_annoyance
ResourceLoader: Fix error message due to already-awaited tasks being re-awaited
| -rw-r--r-- | core/io/resource_loader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index ab263d9485..20dd192da1 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -688,6 +688,7 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro Error wtp_task_err = FAILED; if (loader_is_wtp) { // Loading thread is in the worker pool. + load_task.awaited = true; thread_load_mutex.unlock(); wtp_task_err = WorkerThreadPool::get_singleton()->wait_for_task_completion(load_task.task_id); } @@ -712,7 +713,6 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro } else { DEV_ASSERT(wtp_task_err == OK); thread_load_mutex.lock(); - load_task.awaited = true; } } else { // Loading thread is main or user thread. |