From 4ca2ea8d22b7c703a866de88f0d026b68a8f2822 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 14 Jun 2008 16:38:49 +0000 Subject: bugfix --- ROADMAP | 3 ++- sources/simulator/VSSimulatorCanvas.java | 9 +++++++++ sources/simulator/VSSimulatorFrame.java | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 @@ -1673,6 +1673,15 @@ public class VSSimulatorCanvas extends Canvas return isPaused; } + /** + * Checks if the simulation is resetted. + * + * @return true, if the simulation is resetted + */ + boolean isResetted() { + return isResetted; + } + /** * Checks 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(); -- cgit v1.2.3