Changeset 509

Timestamp:

Jul 3, 2006, 2:30:20 AM (17 years ago)

Author:

livings124

Message:

When quitting, check time a little bit differently.

File:

• trunk/macosx/Controller.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -319 +319 @@
     [fBadger clearBadge];
 
+    //stop running transfers
+    [fTorrents makeObjectsPerformSelector: @selector(stopTransferForQuit)];
+
     //end quickly if updated version will open
     if (fUpdateInProgress)
         return;
 
-    //stop running transfers and wait for them to stop (5 seconds timeout)
-    [fTorrents makeObjectsPerformSelector: @selector(stopTransferForQuit)];
-
+    //wait for running transfers to stop (5 seconds timeout)
     NSDate * start = [NSDate date];
     Torrent * torrent;
-    while ([fTorrents count] > 0)
-    {
-        torrent = [fTorrents objectAtIndex: 0];
-        while( [[NSDate date] timeIntervalSinceDate: start] < 5 &&
-                ![torrent isPaused] )
-        {
-            usleep( 100000 );
+    BOOL timeUp = NO;
+    int i;
+    for (i = 0; i < [fTorrents count]; i++)
+    {
+        if (timeUp)
+            break;
+    
+        torrent = [fTorrents objectAtIndex: i];
+        while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] <= -5.0))
+        {
+            usleep(100000);
             [torrent update];
         }
-        [fTorrents removeObject: torrent];
-    }
+    }
+    [fTorrents release];
 }