From d3d874e0d15569d1c70b5b778bb7e5cc7dce0b81 Mon Sep 17 00:00:00 2001 From: kobewi Date: Sat, 11 Jan 2025 20:59:25 +0100 Subject: [PATCH] Improve missing UID errors --- core/io/resource_uid.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/io/resource_uid.cpp b/core/io/resource_uid.cpp index 545659e460b..8a8c86087d4 100644 --- a/core/io/resource_uid.cpp +++ b/core/io/resource_uid.cpp @@ -151,11 +151,14 @@ void ResourceUID::set_id(ID p_id, const String &p_path) { } String ResourceUID::get_id_path(ID p_id) const { + ERR_FAIL_COND_V_MSG(p_id == INVALID_ID, String(), "Invalid UID."); MutexLock l(mutex); - ERR_FAIL_COND_V(!unique_ids.has(p_id), String()); - const CharString &cs = unique_ids[p_id].cs; + const ResourceUID::Cache *cache = unique_ids.getptr(p_id); + ERR_FAIL_COND_V_MSG(!cache, String(), vformat("Unrecognized UID: \"%s\".", id_to_text(p_id))); + const CharString &cs = cache->cs; return String::utf8(cs.ptr()); } + void ResourceUID::remove_id(ID p_id) { MutexLock l(mutex); ERR_FAIL_COND(!unique_ids.has(p_id));