Fix Variant::in() error on invalid evaluate

JeffVenancius · Feb 13, 2023 · eeed791 · eeed791
1 parent 3e85b0a
commit eeed791
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);
 }