--- a/AbstractSettingsApplication.st	Mon Jun 14 17:07:09 2004 +0200
+++ b/AbstractSettingsApplication.st	Mon Jun 14 20:42:23 2004 +0200
@@ -406,7 +406,6 @@
 !
 
 saveSettings
-
     self basicSaveSettings.
     currentUserPrefs := UserPreferences current.
     self modifiedChannel value:false.
@@ -2008,14 +2007,15 @@
 !
 
 readSettings
-    self st80EditingMode value:UserPreferences current st80EditMode.
+    |prefs|
+
+    prefs := UserPreferences current.
+
+    self st80EditingMode value:prefs st80EditMode.
     self st80DoubleClickSelectMode value:TextView st80SelectMode.
-    self tabsIs4 
-        value:(ListView userDefaultTabPositions = ListView tab4Positions).
-    self searchDialogIsModal 
-        value:UserPreferences current searchDialogIsModal.
-    self startTextDragWithControl 
-        value:UserPreferences current startTextDragWithControl.
+    self tabsIs4 value:(ListView userDefaultTabPositions = ListView tab4Positions).
+    self searchDialogIsModal value:prefs searchDialogIsModal.
+    self startTextDragWithControl value:prefs startTextDragWithControl.
     self modifiedChannel value:false
 ! !
 
@@ -2069,16 +2069,16 @@
 !AbstractSettingsApplication::EditSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-        UserPreferences current st80EditMode ~= (self st80EditingMode value) or:[
-        TextView st80SelectMode ~= (self st80DoubleClickSelectMode value) or:[
-        (tabsIs4 value ~~ (ListView userDefaultTabPositions = ListView tab4Positions) and:[
-            ListView userDefaultTabPositions ~= (self tabsIs4 value ifTrue:[ListView tab4Positions] ifFalse:[ListView tab8Positions]) or:[
-        ]]) or:[
-        UserPreferences current searchDialogIsModal ~= self searchDialogIsModal value or:[
-        UserPreferences current startTextDragWithControl ~= self startTextDragWithControl value ]]]]
-    )
+    currentUserPrefs st80EditMode ~= (self st80EditingMode value) ifTrue:[^ true].
+    TextView st80SelectMode ~= (self st80DoubleClickSelectMode value) ifTrue:[^ true].
+    tabsIs4 value ~~ (ListView userDefaultTabPositions = ListView tab4Positions) ifTrue:[
+        ListView userDefaultTabPositions ~= (self tabsIs4 value 
+                                                ifTrue:[ListView tab4Positions] 
+                                                ifFalse:[ListView tab8Positions]) ifTrue:[^ true].
+    ].
+    currentUserPrefs searchDialogIsModal ~= self searchDialogIsModal value ifTrue:[^ true].
+    currentUserPrefs startTextDragWithControl ~= self startTextDragWithControl value ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::FontSettingsAppl class methodsFor:'defaults'!
@@ -11208,5 +11208,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.156 2004-06-11 17:21:30 stefan Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.157 2004-06-14 18:42:23 cg Exp $'
+! !