X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fgraph%2FSpreadsheetCell.java;h=b7536f83aa906eed9457356d387ff44336408997;hp=7d04e9b6e21c607bb80b30bce98ed10ac8a5489c;hb=25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769;hpb=ccc1271c9d6657fb9dcf4cf3cb115fa0c8cb9589

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
index 7d04e9b6e..b7536f83a 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
@@ -101,22 +101,26 @@ public class SpreadsheetCell implements SpreadsheetElement, SheetNode {
 				AstValue value = ((SpreadsheetFormula)content).value;
 				if(this.inProgress == true) this.iterations++;
 				
-				if(env.iterationEnabled == false){
+				if(!env.getBook().isIterationEnabled()){
 					if(this.inProgress == false){
 						this.inProgress = true;
 						f.result = value.accept(visitor);
 					}
 					else f.result = FormulaError2.CIRCULAR_REF.getString();
 				}
-				else if(iterations<env.iterationLimit){
+				else if(this.iterations<env.iterationLimit){
 					this.inProgress = true;
 					f.result = value.accept(visitor);
 				}
-				else f.result = 0.0;
+				else {
+					if(f.result==null)
+						f.result = 0.0;
+				}
 				
 				env.getBook().registerReferences(makeReferenceKey(), visitor.getReferences());
 			}
 			this.inProgress = false;
+			this.iterations = 0;
 			return (T)f.result;
 		} else if (content instanceof SpreadsheetSCLConstant) {
 		    SpreadsheetSCLConstant sclConstant = (SpreadsheetSCLConstant) content;