Changeset 5823 for trunk/macosx/Controller.m

Timestamp:

May 12, 2008, 9:38:24 PM (14 years ago)

Author:

livings124

Message:

moving torrents between groups will change their groups - this took forever to get not to crash, so enjoy

File:

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

trunk/macosx/Controller.m

@@ -1991 +1991 @@
     if (groupRows)
     {
+        [fDisplayedTorrents removeAllObjects];
+        
         NSSortDescriptor * groupDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"groupOrderValue" ascending: YES] autorelease];
         allTorrents = [allTorrents sortedArrayUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
         
-        NSMutableArray * groups = [NSMutableArray array], * groupTorrents;
+        NSMutableArray * groupTorrents;
         int oldGroupValue = -2;
         for (i = 0; i < [allTorrents count]; i++)
@@ -2005 +2007 @@
                 NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: groupValue], @"Group",
                                         groupTorrents, @"Torrents", nil];
-                [groups addObject: dict];
+                [fDisplayedTorrents addObject: dict];
                 
                 oldGroupValue = groupValue;
@@ -2012 +2014 @@
             [groupTorrents addObject: torrent];
         }
-        
-        [fDisplayedTorrents setArray: groups];
     }
     else
@@ -2037 +2037 @@
     
     [self setBottomCountText: groupRows || filterStatus || filterGroup || filterText];
-
+    
     [self setWindowSizeToFit];
 }
@@ -2663 +2663 @@
         }
         
-        #warning get working
         //reset groups
-        /*if (item)
-        {
-            
+        if (item)
+        {
             //change groups
             int groupValue = [[item objectForKey: @"Group"] intValue];
@@ -2673 +2671 @@
             Torrent * torrent;
             while ((torrent = [enumerator nextObject]))
+            {
+                //have to reset objects here to avoid weird crash
+                [[[fTableView parentForItem: torrent] objectForKey: @"Torrent"] removeObject: torrent];
+                [[item objectForKey: @"Torrent"] addObject: torrent];
+                
                 [torrent setGroupValue: groupValue];
-        }*/
+            }
+            //part 1 of avoiding weird crash
+            [fTableView reloadItem: nil reloadChildren: YES];
+        }
+        
+        //remove objects to reinsert
+        [fTorrents removeObjectsInArray: movingTorrents];
         
         //get all torrents to reorder
         NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"orderValue" ascending: YES] autorelease];
         [fTorrents sortUsingDescriptors: [NSArray arrayWithObject: orderDescriptor]];
-        
-        //remove objects to reinsert
-        [fTorrents removeObjectsInArray: movingTorrents];
         
         //insert objects at new location