--- a/ApplicationModel.st	Tue Nov 13 20:14:26 2001 +0100
+++ b/ApplicationModel.st	Thu Nov 15 11:31:42 2001 +0100
@@ -2245,15 +2245,16 @@
     "this is sent by my topView when about to be closed by the windowManager.
      Could be redefined in subclasses to suppress close or confirm."
 
-    |sav|
-
-    (self window isNil) ifTrue:[
+    |sav window|
+
+    window := self window.
+    window isNil ifTrue:[
         'ApplicationModel [warning]: oops - closeRequest for non-view application arrived' infoPrintCR.
         ^ self
     ].
 
-    (self window isTopView not) ifTrue:[
-        self window topView isModal ifTrue:[
+    (window isTopView not) ifTrue:[
+        window topView isModal ifTrue:[
             WindowGroup leaveSignal raise.
         ].
 
@@ -2264,7 +2265,7 @@
     "/ In multiView apps, tell my master.
     "/ (but not if I am a modal reincarnation)
     (masterApplication notNil 
-    and:[self window isModal not]) ifTrue:[
+    and:[window isModal not]) ifTrue:[
 
         "/ temporary clear my masterApplication to prevent
         "/ endless recursion, in case the master sends me
@@ -2273,7 +2274,7 @@
 
         sav := masterApplication.
         masterApplication := nil.
-        sav closeRequestFor:(self window).
+        sav closeRequestFor:window.
 
         "/ restore - in case master did not want me to close ...
         masterApplication := sav.
@@ -2548,6 +2549,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.161 2001-11-13 19:14:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.162 2001-11-15 10:31:42 penk Exp $'
 ! !
 ApplicationModel initialize!