--- a/Smalltalk.st	Fri Nov 08 19:44:21 2002 +0100
+++ b/Smalltalk.st	Fri Nov 08 19:45:06 2002 +0100
@@ -17,7 +17,7 @@
 	classVariableNames:'StartBlocks ImageStartBlocks ExitBlocks CachedClasses SystemPath
 		StartupClass StartupSelector StartupArguments CommandLine
 		CommandLineArguments CachedAbbreviations SilentLoading
-		Initializing StandAlone HeadlessOperation LogDoits LoadBinaries
+		Initializing StandAlone HeadlessOperation DebuggingStandAlone LogDoits LoadBinaries
 		RealSystemPath ResourcePath SourcePath BitmapPath BinaryPath
 		FileInPath PackagePath BinaryDirName ResourceDirName
 		SourceDirName BitmapDirName PackageDirName FileInDirName
@@ -285,6 +285,7 @@
             Inspector := InspectorView
         ].
         DebugView notNil ifTrue:[
+'33' printCR.
             Debugger := DebugView
         ].
         Display initialize
@@ -404,7 +405,10 @@
         this is not called when an image is restarted; in this
         case the show starts in Smalltalk>>restart."
 
+    |idx|
+
     Initializing := true.
+
     AbstractOperatingSystem initializeConcreteClass.
 
     CommandLineArguments isNil ifTrue:[
@@ -416,14 +420,31 @@
 
     SilentLoading := (CommandLineArguments includes:'--silentStartup').
 
-    "/
-    "/ define low-level debugging tools - graphical classes are not prepared yet
-    "/ to handle things. 
-    "/ This will bring us into the MiniDebugger when an error occurs
-    "/ during startup
-    "/
-    Inspector := MiniInspector.
-    Debugger := MiniDebugger.
+    DebuggingStandAlone := false.
+
+    StandAlone ifTrue:[
+        InfoPrinting := false.
+        ObjectMemory infoPrinting:false.
+
+        idx := CommandLineArguments indexOf:'-debug'.
+        idx ~~ 0 ifTrue:[
+            CommandLineArguments removeAtIndex:idx.
+	    DebuggingStandAlone := true.
+        ].
+        DebuggingStandAlone ifTrue:[
+'11' printCR.
+            Debugger := MiniDebugger.
+	].
+    ] ifFalse:[
+        "/
+        "/ define low-level debugging tools - graphical classes are not prepared yet
+        "/ to handle things. 
+        "/ This will bring us into the MiniDebugger when an error occurs during startup.
+        "/
+        Inspector := MiniInspector.
+'22' printCR.
+        Debugger := MiniDebugger.
+    ].
 
     "/
     "/ start catching SIGSEGV and SIGBUS
@@ -2824,25 +2845,11 @@
     "main startup, if there is a Display, initialize it
      and start dispatching; otherwise go into a read-eval-print loop."
 
-    |idx graphicalMode arg debuggingStandAlone|
+    |idx graphicalMode arg|
 
     graphicalMode := true.
-    debuggingStandAlone := false.
     Initializing := true.
 
-    "/
-    "/ turn off info messages in standAlone app
-    "/
-    StandAlone ifTrue:[
-        InfoPrinting := false.
-        ObjectMemory infoPrinting:false.
-        idx := CommandLineArguments indexOf:'-debug'.
-        idx ~~ 0 ifTrue:[
-            CommandLineArguments removeAtIndex:idx.
-            debuggingStandAlone := true
-        ]
-    ].
-
     "
      while reading patches- and rc-file, do not add things into change-file
     "
@@ -2920,12 +2927,7 @@
         ].
     ].
 
-    StandAlone ifTrue:[
-        Debugger := Inspector := nil.
-        debuggingStandAlone ifTrue:[
-            Debugger := MiniDebugger.
-        ].
-    ] ifFalse:[
+    StandAlone ifFalse:[
         "
          enable the graphical debugger/inspector 
          (they could have been (re)defined as autoloaded in the patches file)
@@ -6300,5 +6302,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.543 2002-11-08 09:57:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.544 2002-11-08 18:45:06 cg Exp $'
 ! !