Changeset 13477

Timestamp:

Mar 3, 2010, 2:01:10 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

In #/windowWillClose: on hemlock-editor-window-controller, try to
guard against an apparent Cocotron bug that involves a window controller
still getting windowWillClose notifications for windows it's not a
delegate for.

File:

• trunk/source/cocoa-ide/cocoa-editor.lisp (modified) (1 diff)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -2413 +2413 @@
   ;; The echo area "document" should probably be a slot in the document
   ;; object, and released when the document object is.
-  (let* ((w (#/window wc))
-         (buf (hemlock-frame-echo-area-buffer w))
-         (echo-doc (if buf (hi::buffer-document buf))))
-    (when echo-doc
-      (setf (hemlock-frame-echo-area-buffer w) nil)
-      (#/close echo-doc))
-    (#/setFrameAutosaveName: w #@"")
-    (#/autorelease w)))
+  (let* ((w (#/window wc)))
+    ;; guard against cocotron lossage
+    (if (#/isKindOfClass: w hemlock-frame)
+      (let* ((buf (hemlock-frame-echo-area-buffer w))
+             (echo-doc (if buf (hi::buffer-document buf))))
+        (when echo-doc
+          (setf (hemlock-frame-echo-area-buffer w) nil)
+          (#/close echo-doc))
+        (#/setFrameAutosaveName: w #@"")
+        #+cocotron
+        (#/removeObserver: (#/defaultCenter ns:ns-notification-center) wc)
+        (#/autorelease w))
+      (#_NSLog #@"window controller %@ got windowWillClose for odd window %@ "
+               :address wc :address w))))
 
 (defmethod hemlock-view ((self hemlock-editor-window-controller))