Changeset 9309

Timestamp:

Oct 15, 2009, 11:18:39 PM (13 years ago)

Author:

livings124

Message:

#2503 When sorting by state, separate queued transfers from paused transfers

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -699 +699 @@
             [download release];
         }
-        [fPendingTorrentDownloads removeAllObjects];
+        [fPendingTorrentDownloads release];
     }
     
@@ -732 +732 @@
     
     [fAutoImportedNames release];
-    [fPendingTorrentDownloads release];
     
     [fPreviewPanel release];
@@ -747 +746 @@
     if ([directObject descriptorType] == typeAEList)
     {
-        for (NSUInteger i = 1; i <= [directObject numberOfItems]; i++)
+        for (NSInteger i = 1; i <= [directObject numberOfItems]; i++)
             if ((urlString = [[directObject descriptorAtIndex: i] stringValue]))
                 break;
@@ -3197 +3196 @@
         
         if (!NSIntersectsRect([fTableView visibleRect], frame))
-                return NSZeroRect;
+            return NSZeroRect;
         
         frame.origin = [fTableView convertPoint: frame.origin toView: nil];

trunk/macosx/Torrent.m

@@ -1472 +1472 @@
 {
     if (![self isActive]) //paused
-        return 0;
+    {
+        if (fWaitToStart)
+            return 1;
+        else
+            return 0;
+    }
     else if ([self isSeeding]) //seeding
-        return 1;
+        return 10;
     else //downloading
-        return 2;
+        return 20;
 }