Merge pull request #62921 from cdemirer/fix-variant-in

Fix `Variant::in()` error on invalid `evaluate`
godotengine · Feb 13, 2023 · 4a2c217 · 4a2c217
2 parents 848c910 + 44b2747
commit 4a2c217
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp
@@ -1105,8 +1105,11 @@ bool Variant::in(const Variant &p_index, bool *r_valid) const {
 	evaluate(OP_IN, p_index, *this, ret, valid);
 	if (r_valid) {
 		*r_valid = valid;
+	}
+	if (valid) {
+		ERR_FAIL_COND_V(ret.type != BOOL, false);
+		return *VariantGetInternalPtr<bool>::get_ptr(&ret);
+	} else {
 		return false;
 	}
-	ERR_FAIL_COND_V(ret.type != BOOL, false);
-	return *VariantGetInternalPtr<bool>::get_ptr(&ret);
 }