diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-08-13 12:52:08 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-09-05 13:30:09 +0200 |
| commit | fe2e862e2eba20f4f2158c40d0ef9c2fdb508b14 (patch) | |
| tree | d66b8546c185ef6e397beb3f2b1c9474eb290869 | |
| parent | c75c50ecac2967217966762d492c4d9d268e51a3 (diff) | |
| download | redot-engine-fe2e862e2eba20f4f2158c40d0ef9c2fdb508b14.tar.gz | |
ResourceLoader: Use better error handling for possible engine bugs
(cherry picked from commit 31a9e10ddb37f7b5c8697c24ba02ce7bd7a1305a)
| -rw-r--r-- | core/io/resource_loader.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index fd4fbc36f7..5204880d9d 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -636,13 +636,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; @@ -732,14 +726,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]; |