summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2008-06-14 16:38:49 +0000
committerPaul Buetow <paul@buetow.org>2008-06-14 16:38:49 +0000
commit4ca2ea8d22b7c703a866de88f0d026b68a8f2822 (patch)
tree926ca7fcfa9d871f7dbac47e61561139ab31b980
parentc28e7cfd6a08f2cdf5e057e62687e3a029d558b1 (diff)
bugfix
-rw-r--r--ROADMAP3
-rw-r--r--sources/simulator/VSSimulatorCanvas.java9
-rw-r--r--sources/simulator/VSSimulatorFrame.java2
3 files changed, 13 insertions, 1 deletions
diff --git a/ROADMAP b/ROADMAP
index a86b230..a56ff56 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -1,4 +1,5 @@
-bugfix? save sim if stopped via toolbare before runs again
+bugfix: first load does not send messages (moormaster dat)
+bugfix: PID table col width
Must do:
Warn if a file does not exists while trying to open!
Reliable Multicast
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java
index 7f5da08..e53ecbf 100644
--- a/sources/simulator/VSSimulatorCanvas.java
+++ b/sources/simulator/VSSimulatorCanvas.java
@@ -1674,6 +1674,15 @@ public class VSSimulatorCanvas extends Canvas
}
/**
+ * Checks if the simulation is resetted.
+ *
+ * @return true, if the simulation is resetted
+ */
+ boolean isResetted() {
+ return isResetted;
+ }
+
+ /**
* Checks if the simulation has finished
*
* @return true, if the simulation has finished
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index beac858..e087376 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -161,6 +161,7 @@ public class VSSimulatorFrame extends VSFrame {
VSSimulatorCanvas simulatorCanvas =
currentSimulator.getSimulatorCanvas();
boolean flag = !simulatorCanvas.isPaused()
+ && !simulatorCanvas.isResetted()
&& !simulatorCanvas.hasFinished();
if (flag)
@@ -177,6 +178,7 @@ public class VSSimulatorFrame extends VSFrame {
VSSimulatorCanvas simulatorCanvas =
currentSimulator.getSimulatorCanvas();
boolean flag = !simulatorCanvas.isPaused()
+ && !simulatorCanvas.isResetted()
&& !simulatorCanvas.hasFinished();
if (flag)
pauseCurrentSimulator();