[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[704] trunk/fuse/fusepb/controllers

[<fr...@us...>]

Revision: 704
          http://sourceforge.net/p/fuse-for-macosx/code/704
Author:   fredm
Date:     2012-11-21 11:42:04 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Fix problem leaving modal state when closing Memory Browser window.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/MemoryBrowserController.h
    trunk/fuse/fusepb/controllers/MemoryBrowserController.m

Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.h
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.h	2012-11-02 12:39:26 UTC (rev 703)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.h	2012-11-21 11:42:04 UTC (rev 704)
@@ -31,7 +31,6 @@
   IBOutlet NSTableView *memoryBrowser;
   NSMutableArray *tableContents;
 }
-- (IBAction)apply:(id)sender;
 - (void)showWindow:(id)sender;
 - (int)numberOfRowsInTableView:(NSTableView *)table;
 - (id)tableView:(NSTableView *)table objectValueForTableColumn:(NSTableColumn *)col row:(int)row;

Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.m	2012-11-02 12:39:26 UTC (rev 703)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.m	2012-11-21 11:42:04 UTC (rev 704)
@@ -34,11 +34,31 @@
 
 - (id)init
 {
+  NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+  NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
+  
   tableContents = nil;
   self = [super initWithWindowNibName:@"MemoryBrowser"];
 
   [self setWindowFrameAutosaveName:@"MemoryBrowserWindow"];
   
+  [nc addObserverForName:@"NSWindowWillCloseNotification"
+                  object:[self window]
+                   queue:mainQueue
+              usingBlock:^(NSNotification *note) {
+                [NSApp stopModal];
+                
+                [tableContents removeAllObjects];
+                
+                [tableContents release];
+                
+                tableContents = nil;
+                
+                [memoryBrowser reloadData];
+                
+                [[DisplayOpenGLView instance] unpause];
+              }];
+
   return self;
 }
 
@@ -55,22 +75,6 @@
   [super dealloc];
 }
 
-- (IBAction)apply:(id)sender
-{
-  [NSApp stopModal];
-  [[self window] close];
-
-  [tableContents removeAllObjects];
-  
-  [tableContents release];
-  
-  tableContents = nil;
-  
-  [memoryBrowser reloadData];
-
-  [[DisplayOpenGLView instance] unpause];
-}
-
 - (void)showWindow:(id)sender
 {
   size_t i, j;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.