From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 6 Jan 2020 22:32:08 +0000 (+0100)
Subject: ModelComponentTestbench works again
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=8df7b9b0a94fcdf14d6910b5ffd6690c4c0a0fa1

ModelComponentTestbench works again
---

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
index 52adeba0..a7f8c831 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
@@ -67,7 +67,7 @@ public class LogicExecuter
 						}
 					}
 					catch (@SuppressWarnings("unused") InterruptedException e)
-					{// do nothing; it is normal execution flow to be interrupted
+					{ // do nothing; it is normal execution flow to be interrupted
 					}
 				}
 			}
@@ -83,8 +83,11 @@ public class LogicExecuter
 		timeline.addEventAddedListener(event ->
 		{
 			if (isRunningLive.get())
-				if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0)
+			{
+				long nextExecSimulTime = this.nextExecSimulTime.get();
+				if (nextExecSimulTime == -1 || Timeline.timeCmp(event.getTiming(), nextExecSimulTime) < 0)
 					simulationThread.interrupt();
+			}
 		});
 		// not optimal; but we don't expect this to happen very often
 		tf.addSimulTimeToRealTimeFactorChangedListener(d -> simulationThread.interrupt());
diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java
index 48f5cf5b..b84877e5 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java
@@ -46,6 +46,7 @@ public class SimpleLogicUIStandalone
 			beforeRun.accept(new VisualisationObjects(logicModel, timeline, ui, exec));
 
 		// run it
+		exec.setSpeedFactor(1);
 		exec.startLiveExecution();
 		ui.run();
 		exec.stopLiveExecution();