--- a/QuerySignal.st	Fri Dec 07 19:13:17 2001 +0100
+++ b/QuerySignal.st	Fri Dec 07 19:13:52 2001 +0100
@@ -432,21 +432,17 @@
                 ^ con argAt:1
             ].
             sig isNil ifTrue:[
-                self halt.
+                self halt:'should not happen'.
             ].
             (sig accepts:self) ifTrue:[
                 ^ super raiseRequest
             ].
         ] ifFalse:[
-            sel == #'handle:do:' ifFalse:[
+            (sel ~~ #'handle:do:'
+            or:[(sig := con receiver) == self
+            or:[(sig accepts:self)]]) ifTrue:[
                 ^ super raiseRequest
             ].
-            (sig := con receiver) == self ifTrue:[
-                ^ super raiseRequest
-            ].
-            (sig accepts:self) ifTrue:[
-                ^ super raiseRequest
-            ]
         ].
         con := con findSpecialHandle:true raise:false.
     ].
@@ -467,5 +463,5 @@
 !QuerySignal class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/QuerySignal.st,v 1.36 2001-08-23 21:07:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/QuerySignal.st,v 1.37 2001-12-07 18:13:52 cg Exp $'
 ! !