1 files changed, 8 insertions, 5 deletions
diff --git a/sources/prefs/editors/VSSimulationEditor.java b/sources/prefs/editors/VSSimulationEditor.java
index ca43962..e274c0b 100644
--- a/sources/prefs/editors/VSSimulationEditor.java
+++ b/sources/prefs/editors/VSSimulationEditor.java
@@ -50,11 +50,12 @@ public class VSSimulationEditor extends VSBetterEditor {
 
         if (actionCommand.equals(prefs.getString("lang.takeover"))) {
             savePrefs();
-            if (expertModeChanged()) {
-                if (simulation != null)
-                    simulation.fireExpertModeChanged();
-            }
-            simulation.updateFromPrefs();
+
+			if (simulation != null) {
+            	if (expertModeChanged())
+               	     simulation.fireExpertModeChanged();
+				simulation.updateFromPrefs();
+			}
 
         } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
 			if (!dontStartNewSimulation)
@@ -68,6 +69,8 @@ public class VSSimulationEditor extends VSBetterEditor {
             }
             if (!dontStartNewSimulation)
                 simulatorFrame.addSimulation(new VSSimulation(prefsToEdit, simulatorFrame));
+			else if (simulation != null)
+            	simulation.updateFromPrefs();
 
         } else {
             super.actionPerformed(e);