From 96b205d2edbd8f7379738c456d83ae831894eeb9 Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Wed, 6 Sep 2017 04:43:07 +0200 Subject: Fixes ERR_EXPLAIN being overwritten --- core/resource.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/resource.cpp') diff --git a/core/resource.cpp b/core/resource.cpp index 37d42226b4..78e20bada4 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -69,12 +69,11 @@ void Resource::set_path(const String &p_path, bool p_take_over) { ResourceCache::resources.get(p_path)->set_name(""); ResourceCache::lock->write_unlock(); } else { - ERR_EXPLAIN("Another resource is loaded from path: " + p_path); - ResourceCache::lock->read_lock(); bool exists = ResourceCache::resources.has(p_path); ResourceCache::lock->read_unlock(); + ERR_EXPLAIN("Another resource is loaded from path: " + p_path); ERR_FAIL_COND(exists); } } -- cgit v1.2.3