Changeset 9736

Timestamp:

Dec 13, 2009, 1:40:53 AM (12 years ago)

Author:

livings124

Message:

eliminate redundant code

File:

• trunk/macosx/Torrent.m (modified) (2 diffs)

trunk/macosx/Torrent.m

@@ -1543 +1543 @@
     if (torrentStruct)
         fHandle = torrentStruct;
-    else if (magnetAddress)
-    {
-        tr_ctor * ctor = tr_ctorNew(lib);
-        
-        tr_ctorSetPaused(ctor, TR_FORCE, YES);
-        if (downloadFolder)
-            tr_ctorSetDownloadDir(ctor, TR_FORCE, [downloadFolder UTF8String]);
-        
-        const tr_parse_result result = tr_ctorSetMagnet(ctor, [magnetAddress UTF8String]);
-        
-        if (result == TR_PARSE_OK)
-            fHandle = tr_torrentNew(ctor, NULL);
-        
-        tr_ctorFree(ctor);
-        
-        if (!fHandle)
-        {
-            [self release];
-            return nil;
-        }
-    }
     else
     {
@@ -1578 +1557 @@
         if (path)
             result = tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
+        
+        if (result != TR_PARSE_OK && magnetAddress)
+            result = tr_ctorSetMagnet(ctor, [magnetAddress UTF8String]);
         
         //backup - shouldn't be needed after upgrade to 1.70