Changeset 499

Timestamp:

Jul 1, 2006, 10:13:29 PM (17 years ago)

Author:

livings124

Message:

Slight cleanup from last commit.

File:

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

trunk/macosx/Controller.m

@@ -1070 +1070 @@
         return;
     else;
-
-    //sort torrents by order value
-    NSArray * sortedTorrents;
-    if ([torrents count] > 1)
-    {
-        NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
-                                                    @"orderValue" ascending: YES] autorelease];
-        NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
-                    
-        sortedTorrents = [torrents sortedArrayUsingDescriptors: descriptors];
-        [descriptors release];
-    }
-    else
-        sortedTorrents = torrents;
-
+    
+    //determine the number of downloads needed to start
     int desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
             
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
         if ([torrent isActive] && ![torrent isSeeding])
@@ -1096 +1083 @@
                 break;
         }
+    
+    //sort torrents by order value
+    NSArray * sortedTorrents;
+    if ([torrents count] > 1 && desiredActive > 0)
+    {
+        NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                                    @"orderValue" ascending: YES] autorelease];
+        NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
+                    
+        sortedTorrents = [torrents sortedArrayUsingDescriptors: descriptors];
+        [descriptors release];
+    }
+    else
+        sortedTorrents = torrents;
 
     enumerator = [sortedTorrents objectEnumerator];