Changeset 154

Timestamp:

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

Author:

titer

Message:

Fixes history with no torrents, always remove ellipis to menu items if
no torrent is selected

File:

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

branches/new_api/macosx/Controller.m

@@ -610 +610 @@
 - (void) updateTorrentHistory
 {
-    if( [fTorrents count] < 1 )
-        return;
-
     NSMutableArray * history = [NSMutableArray
         arrayWithCapacity: [fTorrents count]];
@@ -916 +913 @@
         || action == @selector(removeTorrentDeleteBoth:))
     {
-        if( !torrent )
-            return NO;
-
         //append or remove ellipsis when needed
-        if( [torrent isActive] && [fDefaults boolForKey: @"CheckRemove"] )
+        if( torrent && [torrent isActive] &&
+            [fDefaults boolForKey: @"CheckRemove"] )
         {
             if (![[menuItem title] hasSuffix:NS_ELLIPSIS])
@@ -930 +925 @@
                 [menuItem setTitle:[[menuItem title] substringToIndex:[[menuItem title] length]-[NS_ELLIPSIS length]]];
         }
-        return YES;
+        return ( torrent != nil );
     }
 
@@ -937 +932 @@
         action == @selector(stopTorrent:) )
     {
-        if( !torrent )
-            return NO;
-
-        if( [torrent isActive] )
+        if( !torrent || [torrent isActive] )
         {
             [menuItem setTitle: @"Pause"];
@@ -950 +942 @@
             [menuItem setAction: @selector( resumeTorrent: )];
         }
+        return ( torrent != nil );
     }