Changeset 11988

Timestamp:

Feb 19, 2011, 9:12:45 PM (12 years ago)

Author:

livings124

Message:

when resizing the filter bar, use the filter bar width instead of the status bar width; silence a warning

File:

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

trunk/macosx/Controller.m

@@ -320 +320 @@
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, [fDefaults integerForKey: @"PeersTotal"]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_PEER_LIMIT_TORRENT, [fDefaults integerForKey: @"PeersTorrent"]);
-        tr_bencDictAddBool(&settings, TR_PREFS_KEY_UTP_ENABLED, [fDefaults boolForKey: @"UTPGlobal"]);
         
         const BOOL randomPort = [fDefaults boolForKey: @"RandomPort"];
@@ -344 +343 @@
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_ENABLED, [fDefaults boolForKey: @"DoneScriptEnabled"]);
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_FILENAME, [[fDefaults stringForKey: @"DoneScriptPath"] UTF8String]);
+        tr_bencDictAddBool(&settings, TR_PREFS_KEY_UTP_ENABLED, [fDefaults boolForKey: @"UTPGlobal"]);
         
         tr_formatter_size_init([NSApp isOnSnowLeopardOrBetter] ? 1000 : 1024,
@@ -2723 +2723 @@
             case TR_PARSE_ERR:
                 [fAutoImportedNames removeObject: file];
+                break;
+            
+            case TR_PARSE_DUPLICATE: //let's ignore this (but silence a warning)
+                break;
         }
         
@@ -3920 +3924 @@
     }
     
-    //clear completed transfers item
+    //cleanup completed transfers item
     if (action == @selector(clearCompleted:))
     {
@@ -4251 +4255 @@
     NSRect searchFrame = [fSearchFilterField frame];
     searchFrame.origin.x = NSMaxX(pauseRect) + 5.0;
-    searchFrame.size.width = [fStatusBar frame].size.width - searchFrame.origin.x - 5.0;
+    searchFrame.size.width = [fFilterBar frame].size.width - searchFrame.origin.x - 5.0;
     
     //make sure it is not too long