--- a/SimpleView.st	Thu Dec 21 14:09:27 2000 +0100
+++ b/SimpleView.st	Mon Jan 08 14:42:38 2001 +0100
@@ -3293,7 +3293,7 @@
      the given windowSpec, using the given builder.
      ATTENTION: this is a low level interface; postBuild is NOT invoked"
 
-    |builder subSpec notAnAppModel savedView savApp savedBuilder|
+    |builder subSpec notAnAppModel savedView savApp savedBuilder masterApp|
 
     aWindowSpecOrSpecSymbol isNil ifTrue:[^ self].
 
@@ -3322,8 +3322,10 @@
 
     "/ if the appl is not the master, but the masters builder is used,
     "/ we have to (temporarily change the builders app)
-    anApplication ~~ builder application ifTrue:[
-        anApplication masterApplication ~~ builder application ifTrue:[self halt:'should not happen'].
+
+    masterApp := anApplication perform:#masterApplication ifNotUnderstood:[notAnAppModel := true. nil].
+    (notAnAppModel not and:[anApplication ~~ builder application]) ifTrue:[
+        masterApp ~~ builder application ifTrue:[self halt:'should not happen'].
         builder application:anApplication.
 
         savedView := builder window.
@@ -9094,6 +9096,6 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.403 2000-12-21 13:09:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.404 2001-01-08 13:42:38 cg Exp $'
 ! !
 SimpleView initialize!