diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:42 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:42 +0200 |
| commit | 60ffa9645a29f0bb78c70045cd6d1178f01e9e47 (patch) | |
| tree | 3d4656abab5f70397ed2c7730a8e8131f3054f46 /core/variant | |
| parent | f8b29d54a3b6b7db0f24298679dfcc33d3aa010c (diff) | |
| parent | 48d5b8a8b88a1574d4b7c1e38ee714edb7d808e6 (diff) | |
| download | redot-engine-60ffa9645a29f0bb78c70045cd6d1178f01e9e47.tar.gz | |
Merge pull request #96864 from KoBeWi/dictionerrory
Fix `Dictionary.merge()` type validation
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/dictionary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant/dictionary.cpp b/core/variant/dictionary.cpp index f2522a4545..0754814d35 100644 --- a/core/variant/dictionary.cpp +++ b/core/variant/dictionary.cpp @@ -261,7 +261,7 @@ void Dictionary::merge(const Dictionary &p_dictionary, bool p_overwrite) { Variant key = E.key; Variant value = E.value; 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)) { operator[](key) = value; } |