浏览代码

Fix Dictionary.merge() type validation

kobewi 10 月之前
父节点
当前提交
48d5b8a8b8
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      core/variant/dictionary.cpp

+ 1 - 1
core/variant/dictionary.cpp

@@ -261,7 +261,7 @@ void Dictionary::merge(const Dictionary &p_dictionary, bool p_overwrite) {
 		Variant key = E.key;
 		Variant key = E.key;
 		Variant value = E.value;
 		Variant value = E.value;
 		ERR_FAIL_COND(!_p->typed_key.validate(key, "merge"));
 		ERR_FAIL_COND(!_p->typed_key.validate(key, "merge"));
-		ERR_FAIL_COND(!_p->typed_key.validate(value, "merge"));
+		ERR_FAIL_COND(!_p->typed_value.validate(value, "merge"));
 		if (p_overwrite || !has(key)) {
 		if (p_overwrite || !has(key)) {
 			operator[](key) = value;
 			operator[](key) = value;
 		}
 		}