Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #95477 from RandomShaper/res_load_dev_bugs

Browse Source 
ResourceLoader: Use better error handling for possible engine bugs
This commit is contained in:
Rémi Verschelde 2024-08-16 10:36:33 +02:00
commit ae2044dccb
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/io/resource_loader.cpp
View File

@ -583,13 +583,7 @@ ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const
} }
String local_path = _validate_local_path(p_path); String local_path = _validate_local_path(p_path);
if (!thread_load_tasks.has(local_path)) { ERR_FAIL_COND_V_MSG(!thread_load_tasks.has(local_path), THREAD_LOAD_INVALID_RESOURCE, "Bug in ResourceLoader logic, please report.");
#ifdef DEV_ENABLED
CRASH_NOW();
#endif
// On non-dev, be defensive and at least avoid crashing (at this point at least).
return THREAD_LOAD_INVALID_RESOURCE;
}
ThreadLoadTask &load_task = thread_load_tasks[local_path]; ThreadLoadTask &load_task = thread_load_tasks[local_path];
status = load_task.status; status = load_task.status;
@ -678,14 +672,10 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
if (!p_load_token.local_path.is_empty()) { if (!p_load_token.local_path.is_empty()) {
if (!thread_load_tasks.has(p_load_token.local_path)) { if (!thread_load_tasks.has(p_load_token.local_path)) {
#ifdef DEV_ENABLED
CRASH_NOW();
#endif
// On non-dev, be defensive and at least avoid crashing (at this point at least).
if (r_error) { if (r_error) {
*r_error = ERR_BUG; *r_error = ERR_BUG;
} }
return Ref<Resource>(); ERR_FAIL_V_MSG(Ref<Resource>(), "Bug in ResourceLoader logic, please report.");
} }
ThreadLoadTask &load_task = thread_load_tasks[p_load_token.local_path]; ThreadLoadTask &load_task = thread_load_tasks[p_load_token.local_path];