Avoid to change a variable type when checking its type (#6587)

- Don't show in changelog
4ian · May 24, 2024 · 916e642 · 916e642
1 parent eaebc16
commit 916e642
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h b/Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h
@@ -81,6 +81,9 @@ class GD_CORE_API ExpressionVariablePathFinder
     auto *variable = typeFinder.WalkUntilLastChild(
         typeFinder.variablesContainer->Get(typeFinder.variableName),
         typeFinder.childVariableNames);
+    if (variable && variable->GetType() != gd::Variable::Array) {
+      return gd::Variable::Unknown;
+    }
     return variable && variable->GetChildrenCount() > 0
                ? variable->GetAtIndex(0).GetType()
                : gd::Variable::Unknown;

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js
@@ -291,7 +291,9 @@ export default React.forwardRef<Props, VariableFieldInterface>(
         : null;
     const needManualTypeSwitcher =
       isSwitchableInstruction &&
-      variableType === gd.Variable.Unknown &&
+      variableType !== gd.Variable.Number &&
+      variableType !== gd.Variable.String &&
+      variableType !== gd.Variable.Boolean &&
       !errorText &&
       value;