From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Wed, 16 Dec 2020 08:31:17 +0000 (+0200)
Subject: No more actions after stopping an action context.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f5780a4f2d6e82616016e5e67dd5db9f994268cf;p=simantics%2Fplatform.git

No more actions after stopping an action context.

gitlab #659

Change-Id: Ide954c322f682ff7bc9cbc53e8b5130e0294c9ce
---

diff --git a/bundles/org.simantics.simulation.sequences/src/org/simantics/simulation/sequences/action/AbstractActionContext.java b/bundles/org.simantics.simulation.sequences/src/org/simantics/simulation/sequences/action/AbstractActionContext.java
index 2adb9a045..1187230ad 100644
--- a/bundles/org.simantics.simulation.sequences/src/org/simantics/simulation/sequences/action/AbstractActionContext.java
+++ b/bundles/org.simantics.simulation.sequences/src/org/simantics/simulation/sequences/action/AbstractActionContext.java
@@ -82,6 +82,9 @@ public abstract class AbstractActionContext implements ActionContext {
     
     public double handleStep(double currentTime) {
     	synchronized (this) {
+    		if (stopped)
+    			return Double.POSITIVE_INFINITY;
+    		
 	        this.currentTime = currentTime;
 	        {
 	            ArrayList<Function1<Tuple0, Object>> temp = scheduledNow;
@@ -128,6 +131,9 @@ public abstract class AbstractActionContext implements ActionContext {
         synchronized (this) {
             List<Function1<StopReason, Object>> stopFunctions = new ArrayList<>(scheduledWhenStopped);
             scheduledWhenStopped.clear();
+            
+            scheduledNextStep.clear();
+            scheduledAt.clear();
 
             SCLContext context = SCLContext.getCurrent();
             Object oldActionContext = context.put("sequenceAction", this);