--- a/Signal.st	Sat Jun 06 15:10:37 1998 +0200
+++ b/Signal.st	Sat Jun 06 20:38:24 1998 +0200
@@ -385,6 +385,8 @@
 
     self == anotherSignal ifTrue:[^ false].
     ^ anotherSignal accepts:self
+
+    "Modified: / 6.6.1998 / 20:37:47 / cg"
 !
 
 isHandled
@@ -399,26 +401,28 @@
     "return true, if there is a handler for the receiver signal in the 
      contextChain starting with aContext."
 
-    |con|
+    |con r|
 
     con := aContext.
     [con notNil] whileTrue:[
-	con := con findNextContextWithSelector:#'handle:do:' or:#'handle:from:do:' or:nil.
-	con notNil ifTrue:[
-	    "
-	     is this is a #handle:do: or a #handle:from:do: context
-	     with self in it ?
-	    "
-	    (con receiver accepts:self) ifTrue:[
-		"found a handler context"
+        con := con findNextContextWithSelector:#'handle:do:' or:#'handle:from:do:' or:nil.
+        con notNil ifTrue:[
+            "
+             is this is a #handle:do: or a #handle:from:do: context
+             with self in it ?
+            "
+        
+            ((r := con receiver) notNil
+            and:[r accepts:self]) ifTrue:[
+                "found a handler context"
 
-		^ true
-	    ]
-	]
+                ^ true
+            ]
+        ]
     ].
     ^ false
 
-    "Modified: 20.1.1997 / 12:45:01 / cg"
+    "Modified: / 6.6.1998 / 20:37:16 / cg"
 !
 
 isQuerySignal
@@ -784,6 +788,6 @@
 !Signal class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Signal.st,v 1.50 1998-03-31 13:44:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Signal.st,v 1.51 1998-06-06 18:38:24 cg Exp $'
 ! !
 Signal initialize!