--- a/Launcher.st	Mon Sep 15 23:22:40 1997 +0200
+++ b/Launcher.st	Mon Sep 15 23:25:06 1997 +0200
@@ -2607,10 +2607,10 @@
       nextPutLine:'ObjectMemory justInTimeCompilation: ' , (ObjectMemory justInTimeCompilation storeString) , '.';
       nextPutLine:'ObjectMemory fullSingleStepSupport: ' , (ObjectMemory fullSingleStepSupport storeString) , '.'.
 
-    HistoryManager isActive ifTrue:[
-        s nextPutLine:'HistoryManager activate.'.
+    (HistoryManager notNil and:[HistoryManager isActive]) ifTrue:[
+        s nextPutLine:'HistoryManager notNil ifTrue:[HistoryManager activate].'.
     ] ifFalse:[
-        s nextPutLine:'HistoryManager deactivate.'.
+        s nextPutLine:'HistoryManager notNil ifTrue:[HistoryManager deactivate].'.
     ].
 
     ObjectFileLoader notNil ifTrue:[
@@ -2811,10 +2811,9 @@
         ] ifFalse:[
             sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
         ].
+        box addHorizontalLine.
     ].
 
-    box addHorizontalLine.
-
     box addCheckBox:(resources string:'show error notifier before opening debugger') on:showErrorNotifier.
     box addCheckBox:(resources string:'verbose backtrace by default in debugger') on:showVerboseStack.
 
@@ -2903,8 +2902,8 @@
     ].
     dir := FileDirectory directoryNamed:resourceDir.
 
-    listOfStyles := dir select:[:aFileName | aFileName endsWith:'.style'].
-    listOfStyles := listOfStyles collect:[:aFileName | aFileName copyWithoutLast:6].
+    listOfStyles := dir select:[:aFileName | aFileName asFilename hasSuffix:'style'].
+    listOfStyles := listOfStyles collect:[:aFileName | aFileName asFilename withoutSuffix name].
     listOfStyles sort.
 
 "/ old code: used a standard ListSelectionBox
@@ -4828,5 +4827,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.292 1997-09-08 19:17:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.293 1997-09-15 21:25:06 cg Exp $'
 ! !