--- a/WindowGroup.st	Mon Jun 26 15:43:24 2000 +0200
+++ b/WindowGroup.st	Sun Jul 02 14:52:38 2000 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+"{ Package: 'stx:libview' }"
+
 Object subclass:#WindowGroup
 	instanceVariableNames:'graphicsDevice views topViews myProcess mySensor isModal
 		previousGroup focusView focusSequence preEventHook postEventHook
@@ -298,31 +300,32 @@
     activeProcess := Processor activeProcess.
     " caching the last value ..."
     activeProcess == LastActiveProcess ifTrue:[
-	LastActiveGroup process == LastActiveProcess ifTrue:[
-	    ^ LastActiveGroup
-	]
+        LastActiveGroup process == LastActiveProcess ifTrue:[
+            ^ LastActiveGroup
+        ]
     ].
 
+    WindowGroupQuerySignal isNil ifTrue:[^ nil]. "/ only during very early init phase
     wg := WindowGroupQuerySignal query.
 
     wg isNil ifTrue:[
-	"/ mhmh - noone willing to answer that question ...
-	"/ (how can this happen ?)
-	groups := self scheduledWindowGroups 
-		    select:[:wg | wg process == activeProcess].
-	groups size == 1 ifTrue:[
-	    wg := groups anElement
-	] ifFalse:[
-	    wg := groups detect:[:wg | wg isModal] ifNone:nil.
-	    wg isNil ifTrue:[
-		wg := groups anElement
-	    ]
-	].
+        "/ mhmh - noone willing to answer that question ...
+        "/ (how can this happen ?)
+        groups := self scheduledWindowGroups 
+                    select:[:wg | wg process == activeProcess].
+        groups size == 1 ifTrue:[
+            wg := groups anElement
+        ] ifFalse:[
+            wg := groups detect:[:wg | wg isModal] ifNone:nil.
+            wg isNil ifTrue:[
+                wg := groups anElement
+            ]
+        ].
     ].
 
     wg notNil ifTrue:[
-	LastActiveProcess := activeProcess.
-	LastActiveGroup := wg.
+        LastActiveProcess := activeProcess.
+        LastActiveGroup := wg.
     ].
     ^ wg
 
@@ -2212,6 +2215,6 @@
 !WindowGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.200 2000-02-11 13:50:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.201 2000-07-02 12:52:38 cg Exp $'
 ! !
 WindowGroup initialize!