1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/testing/HeadlessSimulationRunner.java b/src/main/java/testing/HeadlessSimulationRunner.java
index 6279fa9..5a49487 100644
--- a/src/main/java/testing/HeadlessSimulationRunner.java
+++ b/src/main/java/testing/HeadlessSimulationRunner.java
@@ -86,7 +86,9 @@ public class HeadlessSimulationRunner {
             
             // Get the simulation's configured end time
             long untilTime = viz.getUntilTime();
-            long actualMaxTime = Math.min(maxTime, untilTime);
+            long prefsUntilTime = simulator.getPrefs().getInteger("sim.seconds") * 1000L;
+            long actualUntilTime = Math.max(untilTime, prefsUntilTime);
+            long actualMaxTime = Math.min(maxTime, actualUntilTime);
             
             System.out.println("Running simulation for up to " + actualMaxTime + "ms (until time: " + untilTime + "ms)...");
             
@@ -347,4 +349,4 @@ public class HeadlessSimulationRunner {
             }
         }
     }
-}
-\ No newline at end of file
+}