--- a/SubCanvas.st	Tue Feb 08 10:19:19 2000 +0100
+++ b/SubCanvas.st	Tue Feb 08 11:31:31 2000 +0100
@@ -78,6 +78,11 @@
 
     |myApp|
 
+    (client notNil and:[client ~~ anApplication]) ifTrue:[
+        client releaseAsSubCanvas.
+        client := nil.
+    ].
+
     (builder := aBuilder) isNil ifTrue:[
         builder := anApplication perform:#builder
                          ifNotUnderstood:[UIBuilder new]
@@ -93,9 +98,6 @@
         ]
     ].
 
-    (client notNil and:[client ~~ anApplication]) ifTrue:[
-        client releaseAsSubCanvas
-    ].
     client := anApplication.
     self rebuild.
     ^ builder
@@ -415,5 +417,5 @@
 !SubCanvas class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.22 2000-02-01 12:15:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.23 2000-02-08 10:31:31 ca Exp $'
 ! !