--- a/DebugView.st	Sat Dec 11 02:47:54 1993 +0100
+++ b/DebugView.st	Mon Dec 13 18:05:04 1993 +0100
@@ -33,7 +33,7 @@
 connection to the display and dispatch on this one. This will be changed
 using processes soon.
 
-$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.4 1993-12-11 01:41:41 claus Exp $
+$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.5 1993-12-13 17:05:04 claus Exp $
 
 written spring/summer 89 by claus
 '!
@@ -118,6 +118,7 @@
 
     busy := false.
     exitAction := nil.
+    bigStep := false.
 
     bpanel := HorizontalPanelView
                         origin:(0.0 @ 0.0)
@@ -258,8 +259,10 @@
 stepInterrupt
     |where here s|
 
+    "is this for a send or a step ?"
+
     bigStep ifTrue:[
-        where := thisContext.  
+        where := thisContext.
         where := where sender.
         where := where sender.     
         here := where.
@@ -284,6 +287,7 @@
                     ObjectMemory flushInlineCaches.
                     StepInterruptPending := true.
                     InterruptPending := true.
+                    InStepInterrupt := nil.
                     ^ nil
                 ].
                 where := where sender
@@ -322,6 +326,11 @@
 
     oldRecursionLimit := RecursionLimit.
     RecursionLimit := nil.
+    bigStep := false.
+
+    "if debugger is entered while a box has grabbed the
+     pointer, we must ungrab - otherwise X wont talk to
+     us here"
 
     ActiveGrab notNil ifTrue:[
         grabber := ActiveGrab.
@@ -342,9 +351,8 @@
     Display synchronizeOutput.
 
     where := thisContext.
+    where := where sender.
     where notNil ifTrue:[
-        "where is <self enter> context"
-        where := where sender.
         (where receiver == DebugView) ifTrue:[
             where := where sender
         ]
@@ -456,7 +464,8 @@
 
         ObjectMemory stepInterruptHandler:self.
         StepInterruptPending := true.
-        InterruptPending := true
+        InterruptPending := true.
+        InStepInterrupt := nil
     ]
 !