From: Mike Gelfand <mikedld@mikedld.com>
Date: Tue, 2 May 2017 16:58:22 +0000 (+0300)
Subject: Fix torrent file trashing upon addition (Qt client)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd538539aae96f43fd4a1c31e643c5b18d059f8c;p=transmission

Fix torrent file trashing upon addition (Qt client)
---

diff --git a/qt/Session.cc b/qt/Session.cc
index fbf5dfbc5..bc47069ae 100644
--- a/qt/Session.cc
+++ b/qt/Session.cc
@@ -995,7 +995,7 @@ void Session::addTorrent(AddData const& addMe, tr_variant* args, bool trashOrigi
             d->show();
         });
 
-    q->add([this, addMe](RpcResponse const& r)
+    q->add([this, addMe, trashOriginal](RpcResponse const& r)
         {
             tr_variant* dup;
             char const* str;
@@ -1010,17 +1010,13 @@ void Session::addTorrent(AddData const& addMe, tr_variant* args, bool trashOrigi
                 connect(d, SIGNAL(rejected()), d, SLOT(deleteLater()));
                 d->show();
             }
-        });
-
-    if (trashOriginal && addMe.type == AddData::FILENAME)
-    {
-        q->add([this, addMe]()
+            else if (trashOriginal && addMe.type == AddData::FILENAME)
             {
                 QFile original(addMe.filename);
                 original.setPermissions(QFile::ReadOwner | QFile::WriteOwner);
                 original.remove();
-            });
-    }
+            }
+        });
 
     q->run();
 }