Merge remote-tracking branch 'origin/2.8' into master

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/socketapi/socketuploadjob.cpp b/src/gui/socketapi/socketuploadjob.cpp
index 41e1954d5..dca5ab331 100644
--- a/src/gui/socketapi/socketuploadjob.cpp
+++ b/src/gui/socketapi/socketuploadjob.cpp
@@ -68,7 +68,7 @@ void SocketUploadJob::start()
         fail(tr("Local path must be a an absolute path"));
         return;
     }
-    auto tmp = new QTemporaryFile(this);
+    auto tmp = new QTemporaryFile();
     if (!tmp->open()) {
         fail(tr("Failed to create temporary database"));
         return;
@@ -77,6 +77,7 @@ void SocketUploadJob::start()
     auto db = new SyncJournalDb(tmp->fileName(), this);
     auto engine = new SyncEngine(account->account(), _localPath.endsWith(QLatin1Char('/')) ? _localPath : _localPath + QLatin1Char('/'), remotePath, db);
     engine->setParent(db);
+    tmp->setParent(db);
 
     for (const auto &i : excludes) {
         engine->excludedFiles().addManualExclude(i.toString());