--- a/AbstractSettingsApplication.st	Mon Sep 20 11:26:57 2004 +0200
+++ b/AbstractSettingsApplication.st	Mon Sep 20 11:30:54 2004 +0200
@@ -5613,11 +5613,18 @@
 !AbstractSettingsApplication::MiscDisplaySettingsAppl methodsFor:'actions'!
 
 basicSaveSettings
+    |currentScreen mustReopenTools|
+
+    currentScreen := Screen current.
+
     self displaySupportsNativeWidgets ifTrue:[
-        Screen current nativeWidgets:self nativeWidgets value.
+        currentScreen nativeWidgets ~= self nativeWidgets value ifTrue:[
+            mustReopenTools := true.
+            currentScreen nativeWidgets:self nativeWidgets value.
+        ].
     ].
     self displaySupportsNativeDialogs ifTrue:[
-        Screen current nativeDialogs:self nativeDialogs value.
+        currentScreen nativeDialogs:self nativeDialogs value.
     ].
     PopUpView shadows:self shadows value.
 
@@ -5650,12 +5657,13 @@
     StandardSystemView returnFocusWhenClosingModalBoxes:self returnFocus value.
     StandardSystemView takeFocusWhenMapped:self takeFocus value.
     currentUserPrefs focusFollowsMouse:self focusFollowsMouse value.
-    Screen current activateOnClick:self activateOnClick value.
+    currentScreen activateOnClick:self activateOnClick value.
 
     MenuView showAcceleratorKeys:self showAccelerators value.
 
-    self reopenToolsAfterChangedViewStyleSetting.
-
+    mustReopenTools ifTrue:[
+        self reopenToolsAfterChangedViewStyleSetting.
+    ].
     "Modified: / 16.12.2002 / 18:06:31 / penk"
 !
 
@@ -11265,5 +11273,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.175 2004-09-20 09:26:57 ca Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.176 2004-09-20 09:30:54 ca Exp $'
+! !