Changeset 4266

Timestamp:

Dec 21, 2007, 8:39:43 PM (15 years ago)

Author:

livings124

Message:

fix an annoying crash

File:

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

trunk/macosx/Controller.m

@@ -1101 +1101 @@
         {
             NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
-                torrents, @"Torrents",
-                [NSNumber numberWithBool: deleteData], @"DeleteData",
-                [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent", nil];
-
+                                    torrents, @"Torrents",
+                                    [NSNumber numberWithBool: deleteData], @"DeleteData",
+                                    [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent", nil];
+            
             NSString * title, * message;
             
@@ -1155 +1155 @@
                                 "Removal confirm panel -> message part 2")];
             }
-
+            
             NSBeginAlertSheet(title, NSLocalizedString(@"Remove", "Removal confirm panel -> button"),
                 NSLocalizedString(@"Cancel", "Removal confirm panel -> button"), nil, fWindow, self,
@@ -1169 +1169 @@
 {
     NSArray * torrents = [dict objectForKey: @"Torrents"];
-    BOOL deleteData = [[dict objectForKey: @"DeleteData"] boolValue],
-        deleteTorrent = [[dict objectForKey: @"DeleteTorrent"] boolValue];
-    [dict release];
-    
     if (returnCode == NSAlertDefaultReturn)
-        [self confirmRemoveTorrents: torrents deleteData: deleteData deleteTorrent: deleteTorrent];
+        [self confirmRemoveTorrents: torrents deleteData: [[dict objectForKey: @"DeleteData"] boolValue]
+                                                deleteTorrent: [[dict objectForKey: @"DeleteTorrent"] boolValue]];
     else
         [torrents release];
+    
+    [dict release];
 }
 
@@ -1186 +1185 @@
     while ((torrent = [enumerator nextObject]))
         [torrent setWaitToStart: NO];
-
+    
     int lowestOrderValue = -1, currentOrderValue;
-
+    
+    [fTorrents removeObjectsInArray: torrents];
+    [fDisplayedTorrents removeObjectsInArray: torrents];
+    
     enumerator = [torrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
     {
-        [torrent stopTransfer];
-
         if (deleteData)
             [torrent trashData];
@@ -1205 +1205 @@
         
         [torrent closeRemoveTorrent];
-        [fTorrents removeObject: torrent];
-        [fDisplayedTorrents removeObject: torrent];
-    }
+    }
+    
     [torrents release];
 
@@ -1227 +1226 @@
     [fTableView deselectAll: nil];
     
-    [self updateUI];
-    [self applyFilter: nil];
-    [self updateTorrentHistory];
+    [self updateTorrentsInQueue];
 }