--- a/DeviceWorkstation.st	Sat Mar 22 15:52:58 1997 +0100
+++ b/DeviceWorkstation.st	Sat Mar 22 17:20:32 1997 +0100
@@ -4936,15 +4936,21 @@
     ].
 
     idToTableIndexMapping notNil ifTrue:[
-	idx := idToTableIndexMapping at:aWindowID ifAbsent:nil.
-	idx notNil ifTrue:[
+        idx := idToTableIndexMapping at:aWindowID ifAbsent:nil.
+        idx notNil ifTrue:[
             v := knownViews at:idx.
-            (v notNil and:[v ~~ 0]) ifTrue:[^ v].
-	]
+            (v notNil and:[v ~~ 0]) ifTrue:[
+                lastView := v.
+                lastId := aWindowID.
+                ^ v
+            ].
+        ]
     ].
 
     index := knownIds indexOf:aWindowID.
-    index == 0 ifTrue:[^ nil].
+    index == 0 ifTrue:[
+        ^ nil
+    ].
 
     v := knownViews at:index.
     v == 0 ifTrue:[
@@ -4958,7 +4964,7 @@
 
     ^ v
 
-    "Modified: 1.3.1997 / 23:49:33 / cg"
+    "Modified: 22.3.1997 / 17:19:59 / cg"
 ! !
 
 !DeviceWorkstation methodsFor:'window stuff'!
@@ -5229,6 +5235,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.192 1997-03-22 14:52:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.193 1997-03-22 16:20:32 cg Exp $'
 ! !
 DeviceWorkstation initialize!