Changeset 153

Timestamp:

Mar 14, 2006, 11:43:16 PM (16 years ago)

Author:

titer

Message:

Simplifies removing torrents code

File:

• branches/new_api/macosx/Controller.m (modified) (3 diffs)

branches/new_api/macosx/Controller.m

@@ -460 +460 @@
     Torrent * torrent = [fTorrents objectAtIndex: idx];
 
-    if( [torrent isActive] )
-    {
-        if ([fDefaults boolForKey: @"CheckRemove"])
-        {
-            NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                        [NSString stringWithFormat: @"%d", idx], @"Index",
-                        [NSString stringWithFormat: @"%d", deleteTorrent], @"DeleteTorrent",
-                        [NSString stringWithFormat: @"%d", deleteData], @"DeleteData",
-                        nil];
-            [dict retain];
-
-            NSBeginAlertSheet(@"Confirm Remove",
-                                @"Remove", @"Cancel", nil,
-                                fWindow, self,
-                                @selector(removeSheetDidEnd:returnCode:contextInfo:),
-                                NULL, dict, @"This torrent is active. Do you really want to remove it?");
-            return;
-        }
-        //stop if not stopped
-        else
-            [self stopTorrentWithIndex:idx];
-    }
-
-    [self confirmRemoveTorrentWithIndex: idx
-            deleteTorrent: deleteTorrent
-            deleteData: deleteData];
+    if( [torrent isActive] && [fDefaults boolForKey: @"CheckRemove"] )
+    {
+        NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSString stringWithFormat: @"%d", idx], @"Index",
+            [NSString stringWithFormat: @"%d", deleteTorrent], @"DeleteTorrent",
+            [NSString stringWithFormat: @"%d", deleteData], @"DeleteData",
+            nil];
+        [dict retain];
+
+        NSBeginAlertSheet(@"Confirm Remove",
+            @"Remove", @"Cancel", nil, fWindow, self,
+            @selector(removeSheetDidEnd:returnCode:contextInfo:),  NULL, dict,
+            @"This torrent is active. Do you really want to remove it?");
+    }
+    else
+    {
+        [self confirmRemoveTorrentWithIndex: idx
+                deleteTorrent: deleteTorrent
+                deleteData: deleteData];
+    }
 }
 
@@ -492 +486 @@
 {
     [NSApp stopModal];
-    if (returnCode != NSAlertDefaultReturn)
-    {
-        [dict release];
-        return;
-    }
-
-    int idx = [[dict objectForKey:@"Index"] intValue];
-
-    [self stopTorrentWithIndex:idx];
-
-    [self confirmRemoveTorrentWithIndex: idx
-        deleteTorrent: [[dict objectForKey:@"DeleteTorrent"] intValue]
-        deleteData: [[dict objectForKey:@"DeleteData"] intValue]];
+
+    if( returnCode == NSAlertDefaultReturn )
+    {
+        int idx = [[dict objectForKey:@"Index"] intValue];
+
+        [self confirmRemoveTorrentWithIndex: idx
+            deleteTorrent: [[dict objectForKey:@"DeleteTorrent"] intValue]
+            deleteData: [[dict objectForKey:@"DeleteData"] intValue]];
+    }
+
     [dict release];
 }
@@ -512 +503 @@
             deleteData: (BOOL) deleteData
 {
+    /* Pause if not paused already */
+    [self stopTorrentWithIndex:idx];
+
 #if 0
     if( deleteData )