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 52adeba..a7f8c83 100644 (file)
--- 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 48f5cf5..b84877e 100644 (file)
--- 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();