Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r484 r488  
    14371437        || action == @selector(removeDeleteTorrent:) || action == @selector(removeDeleteBoth:))
    14381438    {
    1439         BOOL active = NO,
     1439        BOOL warning = NO, onlyDownloading = [fDefaults boolForKey: @"CheckRemoveDownloading"],
    14401440            canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteBoth:);
    14411441        Torrent * torrent;
     
    14461446        {
    14471447            torrent = [fTorrents objectAtIndex: i];
    1448             if (!active && [torrent isActive])
     1448            if (!warning && [torrent isActive])
    14491449            {
    1450                 active = YES;
    1451                 if (canDelete)
     1450                warning = onlyDownloading ? ![torrent isSeeding] : YES;
     1451                if (warning && canDelete)
    14521452                    break;
    14531453            }
     
    14551455            {
    14561456                canDelete = YES;
    1457                 if (active)
     1457                if (warning)
    14581458                    break;
    14591459            }
     
    14621462        //append or remove ellipsis when needed
    14631463        NSString * title = [menuItem title], * ellipsis = [NSString ellipsis];
    1464         if (active && [fDefaults boolForKey: @"CheckRemove"])
     1464        if (warning && [fDefaults boolForKey: @"CheckRemove"])
    14651465        {
    14661466            if (![title hasSuffix: ellipsis])
Note: See TracChangeset for help on using the changeset viewer.