diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-30 17:48:11 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-30 17:48:11 +0100 |
| commit | 3dfedd69eafdf51a8a60aba226b1414a9f8e69e3 (patch) | |
| tree | 55c55292237096b82de38b1843f7275cd5f21bc0 /core/io/resource_loader.cpp | |
| parent | 736696b533f6add4751467c144dd5a06c905d0d6 (diff) | |
| parent | 7565d1f3abb592a5978613701a4b9b744df748da (diff) | |
| download | redot-engine-3dfedd69eafdf51a8a60aba226b1414a9f8e69e3.tar.gz | |
Merge pull request #87711 from matthew1006/threaded-loading-progress-fix
Fix `ResourceLoader.load_threaded_get_status` returning `[0]` constantly in exported projects.
Diffstat (limited to 'core/io/resource_loader.cpp')
| -rw-r--r-- | core/io/resource_loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index d0494a29fd..197c8813a7 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -244,11 +244,11 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin thread_load_mutex.lock(); HashMap<String, ThreadLoadTask>::Iterator E = thread_load_tasks.find(load_paths_stack->get(load_paths_stack->size() - 1)); if (E) { - E->value.sub_tasks.insert(p_path); + E->value.sub_tasks.insert(p_original_path); } thread_load_mutex.unlock(); } - load_paths_stack->push_back(p_path); + load_paths_stack->push_back(p_original_path); // Try all loaders and pick the first match for the type hint bool found = false; |