Changeset 7522 for trunk/macosx/Controller.m

Timestamp:

Dec 29, 2008, 3:03:11 AM (12 years ago)

Author:

livings124

Message:

small improvement to the group filtering code

File:

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

trunk/macosx/Controller.m

@@ -2004 +2004 @@
     if (groupRows)
     {
-        NSArray * oldTorrentGroups = nil;
+        NSMutableArray * oldTorrentGroups = [NSMutableArray array];
         if ([fDisplayedTorrents count] > 0 && [[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
-            oldTorrentGroups = [NSArray arrayWithArray: fDisplayedTorrents];
+            [oldTorrentGroups addObjectsFromArray: fDisplayedTorrents];
         
         [fDisplayedTorrents removeAllObjects];
@@ -2025 +2025 @@
                 
                 //try to see if the group already exists
-                for (; oldTorrentGroups && currentOldGroupIndex < [oldTorrentGroups count]; currentOldGroupIndex++)
+                for (; currentOldGroupIndex < [oldTorrentGroups count]; currentOldGroupIndex++)
                 {
                     TorrentGroup * currentGroup = [oldTorrentGroups objectAtIndex: currentOldGroupIndex];
-                    if ([currentGroup groupIndex] == groupValue)
+                    const NSInteger currentGroupValue = [currentGroup groupIndex];
+                    if (currentGroupValue == groupValue)
                     {
                         group = currentGroup;
                         [[currentGroup torrents] removeAllObjects];
+                        
+                        currentOldGroupIndex++;
+                    }
+                    
+                    if (currentGroupValue >= groupValue)
                         break;
-                    }
                 }