Changeset 449

Timestamp:

Jun 23, 2006, 5:46:53 PM (17 years ago)

Author:

livings124

Message:

A little bit more thorough check to avoid excess work.

File:

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

trunk/macosx/Controller.m

@@ -1014 +1014 @@
             {
                 if (![torrent isSeeding])
+                {
                     amountToStart--;
+                    if (amountToStart <= 0)
+                        break;
+                }
             }
             else if ([torrent waitingToStart])
@@ -1022 +1026 @@
         
         int waitingCount = [waitingTorrents count];
-        if (amountToStart > waitingCount)
-            amountToStart = waitingCount;
-        
-        //sort torrents by date to start earliest added
-        if (amountToStart > 0 && amountToStart < waitingCount)
-        {
-            NSSortDescriptor * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey:
-                                                        @"date" ascending: YES] autorelease];
-            NSArray * descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nil];
+        
+        if (amountToStart > 0 && waitingCount > 0)
+        {
+            if (amountToStart > waitingCount)
+                amountToStart = waitingCount;
             
-            [waitingTorrents sortUsingDescriptors: descriptors];
-            [descriptors release];
-        }
-        
-        int i;
-        for (i = 0; i < amountToStart; i++)
-            [[waitingTorrents objectAtIndex: i] startTransfer];
+            //sort torrents by date to start earliest added
+            if (amountToStart < waitingCount)
+            {
+                NSSortDescriptor * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                                            @"date" ascending: YES] autorelease];
+                NSArray * descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nil];
+                
+                [waitingTorrents sortUsingDescriptors: descriptors];
+                [descriptors release];
+            }
+            
+            int i;
+            for (i = 0; i < amountToStart; i++)
+                [[waitingTorrents objectAtIndex: i] startTransfer];
+        }
         
         [waitingTorrents release];