Changeset 9433 for trunk/macosx/Controller.m

Timestamp:

Oct 29, 2009, 2:45:58 AM (13 years ago)

Author:

livings124

Message:

trivial cleanup and update strings file

File:

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

trunk/macosx/Controller.m

@@ -847 +847 @@
     }
     
-    tr_info info;
     for (NSString * torrentPath in filenames)
     {
@@ -853 +852 @@
         tr_ctor * ctor = tr_ctorNew(fLib);
         tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
-        tr_parse_result result = tr_torrentParse(ctor, &info);
+        
+        tr_info info;
+        const tr_parse_result result = tr_torrentParse(ctor, &info);
+        tr_ctorFree(ctor);
+        
         if (result != TR_PARSE_OK)
         {
@@ -866 +869 @@
                 NSAssert2(NO, @"Unknown error code (%d) when attempting to open \"%@\"", result, torrentPath);
             
-            tr_ctorFree(ctor);
             tr_metainfoFree(&info);
             continue;
         }
-        
-        tr_ctorFree(ctor);
         
         //determine download location
@@ -889 +889 @@
         
         //determine to show the options window
-        BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
-                            && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
-                            && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
+        const BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
+                                    && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
+                                    && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
         tr_metainfoFree(&info);
         
@@ -2001 +2001 @@
         if ([torrent isActive] && ![torrent isCheckingWaiting])
         {
+            const BOOL isActive = ![torrent isStalled];
+            if (isActive)
+                active++;
+            
             if ([torrent isSeeding])
             {
                 seeding++;
-                BOOL isActive = ![torrent isStalled];
-                if (isActive)
-                    active++;
-                
                 if (filterStatus && !((filterActive && isActive) || filterSeed))
                     continue;
@@ -2014 +2014 @@
             {
                 downloading++;
-                BOOL isActive = ![torrent isStalled];
-                if (isActive)
-                    active++;
-                
                 if (filterStatus && !((filterActive && isActive) || filterDownload))
                     continue;