Merge pull request #119 from stg609/master

Fix return null when return within Foreach
codingseb · Sep 21, 2021 · d9e4baa · d9e4baa
2 parents 6512bc6 + b5634c3
commit d9e4baa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -1447,7 +1447,7 @@ void forAction(int index)
 
                                     lastResult = ScriptEvaluate(subScript, ref isReturn, ref isBreak, ref isContinue);
 
-                                    if (isBreak)
+                                    if (isBreak || isReturn)
                                     {
                                         isBreak = false;
                                         break;