Changeset 488 for trunk/macosx/Controller.m

Timestamp:

Jun 30, 2006, 1:14:52 AM (16 years ago)

Author:

livings124

Message:

Only append an ellipsis when removing will show a warning.

File:

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

trunk/macosx/Controller.m

@@ -1437 +1437 @@
         || action == @selector(removeDeleteTorrent:) || action == @selector(removeDeleteBoth:))
     {
-        BOOL active = NO,
+        BOOL warning = NO, onlyDownloading = [fDefaults boolForKey: @"CheckRemoveDownloading"],
             canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteBoth:);
         Torrent * torrent;
@@ -1446 +1446 @@
         {
             torrent = [fTorrents objectAtIndex: i];
-            if (!active && [torrent isActive])
+            if (!warning && [torrent isActive])
             {
-                active = YES;
-                if (canDelete)
+                warning = onlyDownloading ? ![torrent isSeeding] : YES;
+                if (warning && canDelete)
                     break;
             }
@@ -1455 +1455 @@
             {
                 canDelete = YES;
-                if (active)
+                if (warning)
                     break;
             }
@@ -1462 +1462 @@
         //append or remove ellipsis when needed
         NSString * title = [menuItem title], * ellipsis = [NSString ellipsis];
-        if (active && [fDefaults boolForKey: @"CheckRemove"])
+        if (warning && [fDefaults boolForKey: @"CheckRemove"])
         {
             if (![title hasSuffix: ellipsis])