--- a/DeviceWorkstation.st	Sat Mar 01 23:37:00 1997 +0100
+++ b/DeviceWorkstation.st	Sat Mar 01 23:50:17 1997 +0100
@@ -4826,17 +4826,17 @@
 
     |index v|
 
-    idToViewMapping notNil ifTrue:[
-        v := idToViewMapping at:aWindowID ifAbsent:nil.
-        (v notNil and:[v ~~ 0]) ifTrue:[^ v].
-    ].
-
     aWindowID = lastId ifTrue:[
         lastView notNil ifTrue:[
             ^ lastView
         ]
     ].
 
+    idToViewMapping notNil ifTrue:[
+        v := idToViewMapping at:aWindowID ifAbsent:nil.
+        (v notNil and:[v ~~ 0]) ifTrue:[^ v].
+    ].
+
     index := knownIds indexOf:aWindowID.
     index == 0 ifTrue:[^ nil].
 
@@ -4852,7 +4852,7 @@
 
     ^ v
 
-    "Modified: 1.3.1997 / 20:04:31 / cg"
+    "Modified: 1.3.1997 / 23:49:33 / cg"
 ! !
 
 !DeviceWorkstation methodsFor:'window stuff'!
@@ -5130,6 +5130,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.180 1997-03-01 22:37:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.181 1997-03-01 22:50:17 cg Exp $'
 ! !
 DeviceWorkstation initialize!