From 5f82580e30dfe2d7414a1a0af636b331eb0cfa20 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 13 Dec 2009 01:40:53 +0000
Subject: [PATCH] eliminate redundant code

---
 macosx/Torrent.m | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 1edf58705..e0bd112c5 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1542,27 +1542,6 @@ int trashDataFile(const char * filename)
     
     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
     {
         //set libtransmission settings for initialization
@@ -1578,6 +1557,9 @@ int trashDataFile(const char * filename)
         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
         if (result != TR_PARSE_OK && hashString)
             result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);