Skip to content

Commit

Permalink
ResourceLoader: Use better error handling for possible engine bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomShaper committed Aug 13, 2024
1 parent a7a124a commit 31a9e10
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions core/io/resource_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,7 @@ ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const
}

String local_path = _validate_local_path(p_path);
if (!thread_load_tasks.has(local_path)) {
#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;
}
ERR_FAIL_COND_V_MSG(!thread_load_tasks.has(local_path), THREAD_LOAD_INVALID_RESOURCE, "Bug in ResourceLoader logic, please report.");

ThreadLoadTask &load_task = thread_load_tasks[local_path];
status = load_task.status;
Expand Down Expand Up @@ -676,14 +670,10 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro

if (!p_load_token.local_path.is_empty()) {
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) {
*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];
Expand Down

0 comments on commit 31a9e10

Please sign in to comment.