From b761d274313c35205fec941d6d2d16d8de797a5c Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Thu, 22 May 2008 22:23:26 +0000
Subject: Time bugfix.

---
 sources/simulator/VSSimulationCanvas.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'sources/simulator/VSSimulationCanvas.java')

diff --git a/sources/simulator/VSSimulationCanvas.java b/sources/simulator/VSSimulationCanvas.java
index b520284..9388bb3 100644
--- a/sources/simulator/VSSimulationCanvas.java
+++ b/sources/simulator/VSSimulationCanvas.java
@@ -264,6 +264,9 @@ public class VSSimulationCanvas extends Canvas implements Runnable, MouseMotionL
             ++simulationTime;
         }
 
+        if (simulationTime > untilTime)
+        	simulationTime = untilTime;
+
         offset = simulationTime - lastSimulationTime;
 
         for (long l = 0; l < offset; ++l)
@@ -524,18 +527,16 @@ public class VSSimulationCanvas extends Canvas implements Runnable, MouseMotionL
                 }
 
                 updateSimulation(time, lastTime);
-                paint();
-
-                lastTime = time;
-                time = System.currentTimeMillis() - startTime;
-
-                if (simulationTime > untilTime)
-                    simulationTime = untilTime;
 
                 if (simulationTime == untilTime) {
                     finish();
                     break;
                 }
+
+                paint();
+                lastTime = time;
+                time = System.currentTimeMillis() - startTime;
+
             }
 
             updateSimulation(time, lastTime);
-- 
cgit v1.2.3