浏览代码

Merge pull request #34296 from timothyqiu/lock-33072

Fixes crash when using Resource::_take_over_path
Rémi Verschelde 5 年之前
父节点
当前提交
e62941fb53
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      core/resource.cpp

+ 4 - 1
core/resource.cpp

@@ -68,7 +68,10 @@ void Resource::set_path(const String &p_path, bool p_take_over) {
 		if (p_take_over) {
 
 			ResourceCache::lock->write_lock();
-			ResourceCache::resources.get(p_path)->set_name("");
+			Resource **res = ResourceCache::resources.getptr(p_path);
+			if (res) {
+				(*res)->set_name("");
+			}
 			ResourceCache::lock->write_unlock();
 		} else {
 			ResourceCache::lock->read_lock();