Workspace: FileViewer: -windowWillClose: unset window delegate before releasing window to avoid app crash.

Author: trunkmaster

Applications/Workspace/Viewers/FileViewer.m

@@ -137,15 +137,15 @@ - (void)useViewer:(id<Viewer>)aViewer
     // to decrease retain count on FileViwer.
     // Example: [self windowWillClose:]
     [[viewer view] removeFromSuperview];
-    [viewer autorelease];
+    [viewer release];
   }
 }
 @end
 
 @implementation FileViewer
 
 //=============================================================================
-// Create and destroy
+#pragma mark - Create and destroy
 //=============================================================================
 
 - initRootedAtPath:(NSString *)aRootPath viewer:(NSString *)viewerType isRoot:(BOOL)isRoot
@@ -462,7 +462,7 @@ - (void)dealloc
 }
 
 //=============================================================================
-// Accessories
+#pragma mark - Accessories
 //=============================================================================
 
 - (BOOL)isRootViewer
@@ -499,7 +499,7 @@ - (PathView *)pathView
 }
 
 //=============================================================================
-// Path manipulations
+#pragma mark - Path manipulations
 //=============================================================================
 // displayedPath - relative path which displayed in PathView and Viewer
 // relativePath == displayedPath == path
@@ -540,7 +540,7 @@ - (void)setPathFromAbsolutePath:(NSString *)absolutePath
   if ([pathType isEqualToString:NSDirectoryFileType] ||
       [pathType isEqualToString:NSFilesystemFileType]) {
     ASSIGN(displayedPath, [self pathFromAbsolutePath:absolutePath]);
-    ASSIGN(selection, nil);
+    ASSIGN(selection, (id)nil);
   } else {
     // Set file selection ivar
     filename = [absolutePath lastPathComponent];
@@ -629,7 +629,7 @@ - (NSArray *)directoryContentsAtPath:(NSString *)relPath forPath:(NSString *)tar
 }
 
 //=============================================================================
-// Actions
+#pragma mark - Actions
 //=============================================================================
 
 - (NSArray *)checkSelection:(NSArray *)filenames atPath:(NSString *)relativePath
@@ -992,7 +992,7 @@ - (void)slideToPathFromShelfIcon:(PathIcon *)shelfIcon
 }
 
 //=============================================================================
-// Shelf
+#pragma mark - Shelf
 //=============================================================================
 
 - (void)restoreShelf
@@ -1032,7 +1032,7 @@ - (void)restoreShelf
 }
 
 //=============================================================================
-// Viewer delegate (BrowserViewer, IconViewer, ListViewer, etc.)
+#pragma mark - Viewer delegate (BrowserViewer, IconViewer, ListViewer, etc.)
 //=============================================================================
 
 // Called when viewer contains NXTIcons with editable label (IconViewer)
@@ -1047,7 +1047,7 @@ - (void)viewerDidSetPathTo:(NSString *)path selection:(NSArray *)files
 }
 
 //=============================================================================
-// Splitview delegate
+#pragma mark - Splitview delegate
 //=============================================================================
 - (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize
 {
@@ -1112,7 +1112,7 @@ - (void)splitViewDidResizeSubviews:(NSNotification *)notification
 }
 
 //=============================================================================
-// NXTIconLabel delegate
+#pragma mark - NXTIconLabel delegate
 //=============================================================================
 
 // Called by icon in PathView or IconViewer
@@ -1143,7 +1143,7 @@ - (void)iconLabel:(NXTIconLabel *)anIconLabel
 }
 
 //=============================================================================
-// Window
+#pragma mark - Window
 //=============================================================================
 - (void)_updateFocusInWindow
 {
@@ -1206,6 +1206,8 @@ - (void)windowWillClose:(NSNotification *)notif
 
   // unset viewer to decrease retain count on FileViewer
   [self useViewer:nil];
+  // AppKit will try to send notifications DidBecomeKey, DidBecomeMain to deallocated window (BUG?)
+  [window setDelegate:nil];
 
   [[NSApp delegate] closeViewer:self];
 }
@@ -1252,7 +1254,7 @@ - (void)handleWindowKeyUp:(NSEvent *)theEvent
 }
 
 //=============================================================================
-// Notifications
+#pragma mark - Notifications
 //=============================================================================
 - (void)shelfResizableStateChanged:(NSNotification *)notif
 {
@@ -1537,7 +1539,7 @@ - (void)fileOperationProcessingFile:(NSNotification *)notif
 }
 
 //=============================================================================
-// Dragging
+#pragma mark - Dragging
 //   FileViewer is delegate for PathView (with PathIcon),
 //   ShelfView (with PathIcon).
 //
@@ -1556,6 +1558,7 @@ - (NSDragOperation)draggingSourceOperationMaskForPaths:(NSArray *)paths
   NSString *parentPath;
   NSDragOperation mask;
 
+  NSLog(@"draggingSourceOperationMaskForPaths: %@", paths);
   if ([paths count] == 0) {
     return NSDragOperationNone;
   }
@@ -1582,11 +1585,12 @@ - (NSDragOperation)draggingSourceOperationMaskForPaths:(NSArray *)paths
     }
   }
 
+  NSLog(@"draggingSourceOperationMaskForPaths: %@ - %lu", paths, mask);
   return mask;
 }
 
 //=============================================================================
-// Workspace menu
+#pragma mark - Workspace menu
 //=============================================================================
 
 //--- Menu actions