Changeset 3325

Timestamp:

Oct 8, 2007, 4:15:25 AM (15 years ago)

Author:

livings124

Message:

ensure everything is deallocated properly on quit, libtransmission is closed properly, and inspector window height is remembered

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• InfoWindowController.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -183 +183 @@
 }
 
-- (void) dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    
-    [fInfoController release];
-    [fMessageController release];
-    [fPrefsController release];
-    
-    [fTorrents release];
-    [fDisplayedTorrents release];
-    
-    [fBadger release];
-    [fOverlayWindow release];
-    [fIPCController release];
-    
-    [fAutoImportedNames release];
-    [fPendingTorrentDownloads release];
-    [fTempTorrentFiles release];
-    
-    tr_close(fLib);
-    [super dealloc];
-}
-
 - (void) awakeFromNib
 {
@@ -609 +586 @@
             && (tr_torrentCount(fLib) > 0 || tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED))
         usleep(100000);
+    
+    //remaining calls the same as dealloc
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    
+    [fInfoController release];
+    [fMessageController release];
+    [fPrefsController release];
+    
+    [fTorrents release];
+    [fDisplayedTorrents release];
+    
+    [fBadger release];
+    [fOverlayWindow release];
+    [fIPCController release];
+    
+    [fAutoImportedNames release];
+    [fPendingTorrentDownloads release];
+    [fTempTorrentFiles release];
+    
+    tr_close(fLib);
 }
 

trunk/macosx/InfoWindowController.m

@@ -160 +160 @@
 - (void) dealloc
 {
-    #warning not called?
-    float viewHeight = [[self tabViewForTag: fCurrentTabTag] frame].size.height;
-    
     //save resizeable view height
     if (fCurrentTabTag == TAB_PEERS_TAG || fCurrentTabTag == TAB_FILES_TAG)
-        [[NSUserDefaults standardUserDefaults] setFloat: viewHeight forKey: @"InspectorContentHeight"];
+        [[NSUserDefaults standardUserDefaults] setFloat: [[self tabViewForTag: fCurrentTabTag] frame].size.height
+            forKey: @"InspectorContentHeight"];
     
     [[NSNotificationCenter defaultCenter] removeObserver: self];
@@ -200 +198 @@
         else
         {
-            [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected",
-                                                            "Inspector -> above tabs -> selected torrents")];
+            [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> above tabs -> selected torrents")];
             [fSizeField setStringValue: @""];