Changeset 1330 for trunk/macosx/Controller.m

Timestamp:

Jan 9, 2007, 4:23:35 AM (15 years ago)

Author:

livings124

Message:

removed redundant queueing code

File:

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

trunk/macosx/Controller.m

@@ -1141 +1141 @@
         seed = [fDefaults boolForKey: @"QueueSeed"];
     
-    if (!download && !seed)
-    {
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        Torrent * torrent;
-        while ((torrent = [enumerator nextObject]))
-            if (![torrent isActive] && [torrent waitingToStart])
-                [torrent startTransfer];
-        
-        [self updateUI: nil];
-        [self applyFilter: nil];
-        [self updateTorrentHistory];
-        
-        return;
-    }
-    
     //determine the number of downloads needed to start
     int desiredDownloadActive = download ? [fDefaults integerForKey: @"QueueDownloadNumber"] : 0,
         desiredSeedActive = seed ? [fDefaults integerForKey: @"QueueSeedNumber"] : 0;
-            
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    
     Torrent * torrent;
-    while ((torrent = [enumerator nextObject]))
-        if ([torrent isActive] && ![torrent isError])
-        {
-            if ([torrent progress] < 1.0)
-                desiredDownloadActive--;
-            else
-                desiredSeedActive--;
-            
-            if (desiredDownloadActive <= 0 && desiredSeedActive <= 0)
-                break;
-        }
+    NSEnumerator * enumerator;
+    if (download || seed)
+    {
+        enumerator = [fTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isActive] && ![torrent isError])
+            {
+                if ([torrent progress] < 1.0)
+                    desiredDownloadActive--;
+                else
+                    desiredSeedActive--;
+                
+                if (desiredDownloadActive <= 0 && desiredSeedActive <= 0)
+                    break;
+            }
+    }
     
     //sort torrents by order value
@@ -1260 +1249 @@
             [torrent stopTransfer];
             [torrent setWaitToStart: YES];
-            [torrent update];
         }
     }