Changeset 2205 for trunk/macosx/Controller.m

Timestamp:

Jun 27, 2007, 12:42:06 AM (15 years ago)

Author:

livings124

Message:

reflect some of the changes in libT (some, which means it still doesn't compile ;))

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -545 +545 @@
     //save history and stop running torrents
     [self updateTorrentHistory];
-    [fTorrents makeObjectsPerformSelector: @selector(stopTransferForQuit)];
+    #warning check if all torrents are fully released
+    [fDisplayedTorrents removeAllObjects];
+    [fTorrents removeAllObjects];
     
     //disable NAT traversal
@@ -559 +561 @@
     [fBadger clearBadge];
 
-    //wait for running transfers to stop (5 second timeout)
+    //wait for running transfers to stop and for NAT to be disabled (5 second timeout)
     NSDate * start = [NSDate date];
-    BOOL timeUp = NO;
-    
-    enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
-    while (!timeUp && (torrent = [enumerator nextObject]))
-        while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
-        {
-            usleep(100000);
-            [torrent update];
-        }
-    
-    //wait for NAT to be disabled (same 5 second timeout)
-    while (!([start timeIntervalSinceNow] < -5.0)
-                && tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED)
+    while ([start timeIntervalSinceNow] >= -5.0
+            && (tr_torrentCount(fLib) > 0 || tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED))
         usleep(100000);
 }
@@ -1208 +1198 @@
     if (code == NSOKButton)
     {
-        //move torrent data file to new location
         NSEnumerator * enumerator = [torrents objectEnumerator];
         Torrent * torrent;