1 files changed, 12 insertions, 9 deletions

diff --git a/sources/prefs/editors/VSSimulationEditor.java b/sources/prefs/editors/VSSimulationEditor.java
index dd502b2..b4566ef 100644
--- a/sources/prefs/editors/VSSimulationEditor.java
+++ b/sources/prefs/editors/VSSimulationEditor.java
@@ -10,23 +10,23 @@ import java.io.File;
 
 import simulator.*;
 import utils.*;
-import prefs.VSPrefs;
+import prefs.*;
 
 public class VSSimulationEditor extends VSBetterEditor {
     private boolean startNewSimulation;
     private VSSimulatorFrame simulatorFrame;
 
-    public VSSimulationEditor(VSPrefs prefs, Component relativeTo) {
-        super(prefs, relativeTo, prefs, prefs.getString("name")
+    public VSSimulationEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame) {
+        super(prefs, prefs, prefs.getString("name")
               + " - " + prefs.getString("lang.prefs"));
-        this.simulatorFrame = (VSSimulatorFrame) relativeTo;
+        this.simulatorFrame = simulatorFrame;
 
         startNewSimulation = true;
         init();
     }
 
-    public VSSimulationEditor(VSPrefs prefs, Component relativeTo, int prefsCategory) {
-        super(prefs, relativeTo, prefs, prefs.getString("name")
+    public VSSimulationEditor(VSPrefs prefs, int prefsCategory) {
+        super(prefs, prefs, prefs.getString("name")
               + " - " + prefs.getString("lang.prefs"
                                         + (prefsCategory == ALL_PREFERENCES ? ".ext" : "")),
               prefsCategory);
@@ -36,7 +36,7 @@ public class VSSimulationEditor extends VSBetterEditor {
     }
 
     private void init() {
-        super.infoArea.setText(prefs.getString("lang.prefs.info!"));
+        infoArea.setText(prefs.getString("lang.prefs.info!"));
     }
 
     public void actionPerformed(ActionEvent e) {
@@ -46,7 +46,9 @@ public class VSSimulationEditor extends VSBetterEditor {
             super.actionPerformed(e);
             prefsToEdit.saveFile();
 
-            frame.dispose();
+            VSFrame frame = getFrame();
+            if (frame != null)
+                frame.dispose();
 
             if (startNewSimulation)
                 simulatorFrame.addSimulation(
@@ -58,6 +60,7 @@ public class VSSimulationEditor extends VSBetterEditor {
     }
 
     public void newVSEditorInstance(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) {
-        new VSSimulationEditor(prefs, getFrame(), prefsCategory);
+        VSPrefs newPrefs = VSDefaultPrefs.init();
+        new VSEditorFrame(newPrefs, getFrame(), new VSSimulationEditor(prefs, prefsCategory));
     }
 }