--- a/Launcher.st	Wed Oct 29 17:02:53 1997 +0100
+++ b/Launcher.st	Wed Oct 29 17:06:29 1997 +0100
@@ -1154,8 +1154,13 @@
     ].
 
     catchRedefs := Class catchMethodRedefinitions asValue.
-    historyLines := (HistoryManager notNil and:[HistoryManager isActive]) asValue.
-    fullHistoryUpdate := (HistoryManager notNil and:[HistoryManager fullHistoryUpdate]) asValue.
+    historyLines := HistoryManager notNil and:[HistoryManager isLoaded and:[HistoryManager isActive]].
+    historyLines ifFalse:[
+        fullHistoryUpdate := false    
+    ] ifTrue:[
+        fullHistoryUpdate := HistoryManager fullHistoryUpdate asValue.
+    ].
+    historyLines := historyLines asValue.
 
     keepSourceOptions := #( keep reference absReference sourceReference discard ).
     keepSource := SelectionInList new list:(resources array:#('keep as string' 'reference to filename' 'reference to full path' 'append and ref in `st.src''' 'discard' )).
@@ -1443,7 +1448,7 @@
 
     "Modified: / 10.9.1995 / 19:19:18 / claus"
     "Modified: / 9.9.1996 / 22:42:47 / stefan"
-    "Modified: / 24.10.1997 / 02:29:06 / cg"
+    "Modified: / 29.10.1997 / 15:48:31 / cg"
 !
 
 displaySettings
@@ -3557,6 +3562,8 @@
 !
 
 setupAboutMenu
+    <resource: #programMenu >
+
     "setup the about- pulldown menu"
 
     myMenu at:#about 
@@ -3572,11 +3579,13 @@
                       )
            receiver:self.
 
-    "Created: 8.1.1997 / 14:03:20 / cg"
-    "Modified: 8.1.1997 / 14:04:19 / cg"
+    "Created: / 8.1.1997 / 14:03:20 / cg"
+    "Modified: / 29.10.1997 / 03:40:36 / cg"
 !
 
 setupClassesMenu
+    <resource: #programMenu >
+
     "setup the classes- pulldown menu"
 
     myMenu at:#classes 
@@ -3615,8 +3624,8 @@
             after:#startClassTreeView
     ].
 
-    "Created: 8.1.1997 / 14:05:44 / cg"
-    "Modified: 14.1.1997 / 12:55:02 / cg"
+    "Created: / 8.1.1997 / 14:05:44 / cg"
+    "Modified: / 29.10.1997 / 03:40:42 / cg"
 !
 
 setupDemoMenu
@@ -3787,6 +3796,8 @@
 !
 
 setupFileMenu
+    <resource: #programMenu >
+
     "setup the file- pulldown menu"
 
     |l s|
@@ -3815,10 +3826,13 @@
            selectors:s
            receiver:self.
 
-    "Created: 8.1.1997 / 14:04:15 / cg"
+    "Created: / 8.1.1997 / 14:04:15 / cg"
+    "Modified: / 29.10.1997 / 03:40:49 / cg"
 !
 
 setupHelpMenu
+    <resource: #programMenu >
+
     "setup the help- pulldown menu"
 
     |l s|
@@ -3877,7 +3891,8 @@
         (myMenu menuAt:#help) checkToggleAt:#toggleActiveHelp: put:true
     ].
 
-    "Created: 8.1.1997 / 14:08:09 / cg"
+    "Created: / 8.1.1997 / 14:08:09 / cg"
+    "Modified: / 29.10.1997 / 03:40:53 / cg"
 !
 
 setupMainMenu
@@ -3885,6 +3900,8 @@
      Extracted into a separate method, to allow subclasses to
      add their own entries"
 
+    <resource: #programMenu >
+
     |icon|
 
     myMenu labels:(resources array:#(
@@ -3916,8 +3933,8 @@
                                      #demos
                                      #help).
 
-    "Created: 8.1.1997 / 13:58:50 / cg"
-    "Modified: 13.1.1997 / 23:33:09 / cg"
+    "Created: / 8.1.1997 / 13:58:50 / cg"
+    "Modified: / 29.10.1997 / 03:41:00 / cg"
 !
 
 setupMenu
@@ -3970,6 +3987,8 @@
 setupProjectsMenu
     "setup the projects- pulldown menu"
 
+    <resource: #programMenu >
+
     myMenu at:#projects 
            putLabels:(resources array:#(
                                         'new project'
@@ -3983,12 +4002,15 @@
                       )
            receiver:self.
 
-    "Created: 8.1.1997 / 14:06:18 / cg"
+    "Created: / 8.1.1997 / 14:06:18 / cg"
+    "Modified: / 29.10.1997 / 03:41:09 / cg"
 !
 
 setupSettingsMenu
     "setup the settings- pulldown menu"
 
+    <resource: #programMenu >
+
     myMenu at:#settings 
            putLabels:(resources array:#(
                                         'language ...'
@@ -4024,8 +4046,8 @@
                       )
            receiver:self.
 
-    "Created: 8.1.1997 / 14:07:00 / cg"
-    "Modified: 17.1.1997 / 17:40:00 / cg"
+    "Created: / 8.1.1997 / 14:07:00 / cg"
+    "Modified: / 29.10.1997 / 03:41:17 / cg"
 !
 
 setupToolsMenu
@@ -4862,5 +4884,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.300 1997-10-28 19:23:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.301 1997-10-29 16:04:36 cg Exp $'
 ! !