summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Etcheverry <ignalfonsore@gmail.com>2017-09-06 04:43:07 +0200
committerIgnacio Etcheverry <ignalfonsore@gmail.com>2017-09-06 04:43:07 +0200
commit96b205d2edbd8f7379738c456d83ae831894eeb9 (patch)
tree6e51440c7826fd68e1fedc8ef63bf5e899dbff41
parente192c1a7d3414129fb9e41d91bc7bbbe66e58f14 (diff)
Fixes ERR_EXPLAIN being overwritten
-rw-r--r--core/resource.cpp3
1 files changed, 1 insertions, 2 deletions
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);
}
}