--- a/AbstractLauncherApplication.st	Wed Dec 01 22:12:56 1999 +0100
+++ b/AbstractLauncherApplication.st	Thu Dec 02 14:44:57 1999 +0100
@@ -3225,7 +3225,8 @@
     s nextPutLine:'"/ Display settings:'.
     s nextPutLine:'"/'.
     s nextPutLine:'"/ only restore the display settings, if on the same Display ...'.
-    s nextPutLine:'Display displayName = ' , (Display displayName storeString) , ' ifTrue:['.
+    s nextPutLine:'Display notNil ifTrue:['.
+    s nextPutLine:' Display displayName = ' , (Display displayName storeString) , ' ifTrue:['.
       screen := Screen current.
       screen fixColors notNil ifTrue:[
         s nextPutLine:'  Image flushDeviceImages.'.
@@ -3241,6 +3242,7 @@
       s nextPutLine:'  Display supportsDeepIcons: ' , (screen supportsDeepIcons storeString) , '.'.
       s nextPutLine:'  Image ditherAlgorithm: ' , (Image ditherAlgorithm storeString) , '.'.
       s nextPutLine:'  View defaultStyle:' , View defaultStyle storeString , '.'.
+    s nextPutLine:' ].'.
     s nextPutLine:'].'.
     s cr.
 
@@ -3331,7 +3333,9 @@
       nextPutLine:'StandardSystemView returnFocusWhenClosingModalBoxes: ' , (StandardSystemView returnFocusWhenClosingModalBoxes storeString) , '.';
       nextPutLine:'StandardSystemView takeFocusWhenMapped: ' , (StandardSystemView takeFocusWhenMapped storeString) , '.';
       nextPutLine:'UserPreferences current focusFollowsMouse: ' , (currentUserPrefs focusFollowsMouse ? true) storeString , '.';
-      nextPutLine:'Display activateOnClick: ' , ((Display activateOnClick:nil) storeString) , '.';
+      nextPutLine:'Display notNil ifTrue:[';
+      nextPutLine:' Display activateOnClick: ' , ((Display activateOnClick:nil) storeString) , '.';
+      nextPutLine:'].';
       nextPutLine:'MenuView showAcceleratorKeys: ' , (MenuView showAcceleratorKeys storeString) , '.';
       nextPutLine:'Class tryLocalSourceFirst: ' , (Class tryLocalSourceFirst storeString) , '.'.
     (Exception emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) ifTrue:[
@@ -3370,7 +3374,8 @@
     s nextPutLine:'"/ Font settings:'.
     s nextPutLine:'"/'.
     s nextPutLine:'"/ only restore the display settings, if on the same Display ...'.
-    s nextPutLine:'Display displayName = ' , (Display displayName storeString) , ' ifTrue:['.
+    s nextPutLine:'Display notNil ifTrue:['.
+    s nextPutLine:' Display displayName = ' , (Display displayName storeString) , ' ifTrue:['.
     s nextPutLine:'  View defaultFont: ' , (View defaultFont storeString) , '.'.
     s nextPutLine:'  Label defaultFont: ' , (Label defaultFont storeString) , '.'.
     s nextPutLine:'  Button defaultFont: ' , (Button defaultFont storeString) , '.'.
@@ -3381,6 +3386,7 @@
     s nextPutLine:'  TextView defaultFont: ' , (TextView defaultFont storeString) , '.'.
     s nextPutLine:'  EditTextView defaultFont: ' , (EditTextView defaultFont storeString) , '.'.
     s nextPutLine:'  CodeView defaultFont: ' , (CodeView defaultFont storeString) , '.'.
+    s nextPutLine:' ].'.
     s nextPutLine:'].'.
 
     s cr.
@@ -4819,5 +4825,5 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.83 1999-10-27 17:30:02 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.84 1999-12-02 13:44:57 cg Exp $'
 ! !