window close bug

3 files changed, 17 insertions, 5 deletions

diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java
index ee78b04..c9b4fab 100644
--- a/sources/prefs/editors/VSSimulatorEditor.java
+++ b/sources/prefs/editors/VSSimulatorEditor.java
@@ -36,6 +36,10 @@ import prefs.*;
 public class VSSimulatorEditor extends VSAbstractBetterEditor {
     private static final long serialVersionUID = 1L;
 
+    public static final boolean OPENED_NEW_WINDOW = true;
+
+    public static final boolean OPENED_NEW_TAB = false;
+
     /** The simulator frame. */
     private VSSimulatorFrame simulatorFrame;
 
@@ -48,6 +52,9 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
     /** The dont start new simulation. */
     private boolean dontStartNewSimulation;
 
+    /** Open a new simulator window. */
+    private boolean openedNewWindow;
+
     /**
      * Instantiates a new lang.process.removesimulator editor.
      *
@@ -55,7 +62,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      * @param simulatorFrame the simulator frame
      * @param simulation the simulation
      */
-    public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame, VSSimulator simulation) {
+    public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
+                             VSSimulator simulation) {
         super(prefs, prefs, prefs.getString("lang.name")
               + " - " + prefs.getString("lang.prefs"));
         this.dontStartNewSimulation = true;//simulation != null;
@@ -69,10 +77,12 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      * @param prefs the prefs
      * @param simulatorFrame the simulator frame
      */
-    public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame) {
+    public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
+                             boolean openedNewWindow) {
         super(prefs, prefs, prefs.getString("lang.name")
               + " - " + prefs.getString("lang.prefs"));
         this.simulatorFrame = simulatorFrame;
+        this.openedNewWindow = openedNewWindow;
     }
 
     /* (non-Javadoc)
@@ -105,7 +115,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
             }
 
         } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
-            if (!dontStartNewSimulation)
+            if (!dontStartNewSimulation && openedNewWindow)
                 simulatorFrame.dispose();
 
         } else if (actionCommand.equals(prefs.getString("lang.ok"))) {
diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java
index 2385354..0df4a41 100644
--- a/sources/simulator/VSMain.java
+++ b/sources/simulator/VSMain.java
@@ -70,7 +70,8 @@ public class VSMain {
             new VSSimulatorFrame(prefs, relativeTo);
 
         new VSEditorFrame(prefs, relativeTo,
-                          new VSSimulatorEditor(prefs, simulatorFrame));
+                          new VSSimulatorEditor(prefs, simulatorFrame,
+                                                VSSimulatorEditor.OPENED_NEW_WINDOW));
     }
 
     /**
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index 4c8e67f..9b6ca3c 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -127,7 +127,8 @@ public class VSSimulatorFrame extends VSFrame {
                 finalPrefs.getString("lang.simulation.new"))) {
                     VSPrefs newPrefs = VSDefaultPrefs.init();
                     VSSimulatorEditor simulatorEditor =
-                        new VSSimulatorEditor(newPrefs, VSSimulatorFrame.this);
+                        new VSSimulatorEditor(newPrefs, VSSimulatorFrame.this,
+                                              VSSimulatorEditor.OPENED_NEW_TAB);
                     new VSEditorFrame(newPrefs, VSSimulatorFrame.this,
                                       simulatorEditor);