Changeset 2262

Timestamp:

Jul 1, 2007, 5:23:07 AM (15 years ago)

Author:

livings124

Message:

Don't make other actions rely on dealloc being called...it's not reliable. This should make quitting faster in many instances.

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• macosx/Controller.m (modified) (10 diffs)
• macosx/Credits.rtf (modified) (previous)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (3 diffs)

trunk/AUTHORS

@@ -113 +113 @@
 Rashid Eissing
  + Transfers preferences icon
- + Interface conceptualization
 
 Deanna Phillips

trunk/macosx/Controller.m

@@ -162 +162 @@
         fLib = tr_init("macosx");
         
-        fTorrents = [[NSMutableArray alloc] init];
-        fDisplayedTorrents = [[NSMutableArray alloc] init];
+        fTorrents = [[[NSMutableArray alloc] init] retain];
+        fDisplayedTorrents = [[[NSMutableArray alloc] init] retain];
         fPendingTorrentDownloads = [[NSMutableDictionary alloc] init];
         
@@ -179 +179 @@
         
         [GrowlApplicationBridge setGrowlDelegate: self];
-        
         [[UKKQueue sharedFileWatcher] setDelegate: self];
     }
@@ -194 +193 @@
     
     [fToolbar release];
+    
     [fTorrents release];
     [fDisplayedTorrents release];
+    
     [fBadger release];
     if (fOverlayWindow)
@@ -298 +299 @@
     //old version saved transfer info in prefs file
     if (!history)
+    {
         if ((history = [fDefaults arrayForKey: @"History"]))
             [history retain];
-    [fDefaults removeObjectForKey: @"History"];
+        [fDefaults removeObjectForKey: @"History"];
+    }
     
     if (history)
@@ -371 +374 @@
         currentFilterButton = fNoFilterButton;
     }
-
+    
     [currentFilterButton setEnabled: YES];
     
@@ -432 +435 @@
     [self applyFilter: nil];
     
-    [fWindow makeKeyAndOrderFront: nil];
-
     if ([fDefaults boolForKey: @"InfoVisible"])
         [self showInfo: nil];
@@ -545 +546 @@
     //save history and stop running torrents
     [self updateTorrentHistory];
+    
+    //make sure torrent is closed
+    enumerator = [fTorrents objectEnumerator];
+    Torrent * torrent;
+    while ((torrent = [enumerator nextObject]))
+        [torrent closeTorrent];
+    
     [fDisplayedTorrents removeAllObjects];
     [fTorrents removeAllObjects];
@@ -1148 +1156 @@
             lowestOrderValue = currentOrderValue;
         
-        [torrent removeTorrent];
+        [torrent closeRemoveTorrent];
         [fTorrents removeObject: torrent];
         [fDisplayedTorrents removeObject: torrent];
@@ -1701 +1709 @@
     
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
-    BOOL filtering = ![filterType isEqualToString: @"None"];
     
     int downloading = 0, seeding = 0, paused = 0;
@@ -1707 +1714 @@
             isSeeding = [filterType isEqualToString: @"Seed"],
             isPaused = [filterType isEqualToString: @"Pause"];
+    BOOL filtering = isDownloading || isSeeding || isPaused;
     
     //get count of each type

trunk/macosx/Torrent.h

@@ -76 +76 @@
 - (NSDictionary *) history;
 
-- (void) removeTorrent;
+- (void) closeTorrent;
+- (void) closeRemoveTorrent;
 
 - (void) changeIncompleteDownloadFolder: (NSString *) folder;

trunk/macosx/Torrent.m

@@ -193 +193 @@
 - (void) dealloc
 {
+    # warning cleanup
     if (fHandle)
     {
-        tr_torrentClose(fHandle);
-        
         if (fDownloadFolder)
             [fDownloadFolder release];
@@ -232 +231 @@
 }
 
-- (void) removeTorrent
+- (void) closeTorrent
+{
+    tr_torrentClose(fHandle);
+}
+
+- (void) closeRemoveTorrent
 {
     tr_torrentRemoveSaved(fHandle);
+    [self closeTorrent];
 }
 
@@ -1498 +1503 @@
     }
     
-    #warning duplicate warning?
     NSString * currentDownloadFolder;
     tr_info_t info;