X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.cpp;h=cf07f29d401d53f7e5ca6a6482152ff04cc73c8d;hp=9141e8a9358cc4dfdcb45bb6f966d7f2aecd5d65;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=dd711790dddee81442e2138b3917764dac39c487

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index 9141e8a9..cf07f29d 100644
--- a/src/common/transfer.cpp
+++ b/src/common/transfer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,7 +20,8 @@
 
 #include "transfer.h"
 
-INIT_SYNCABLE_OBJECT(Transfer)
+#include <utility>
+
 Transfer::Transfer(const QUuid &uuid, QObject *parent)
     : SyncableObject(parent),
     _status(Status::New),
@@ -32,15 +33,15 @@ Transfer::Transfer(const QUuid &uuid, QObject *parent)
     init();
 }
 
-Transfer::Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
+Transfer::Transfer(Direction direction, QString nick, QString fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
     : SyncableObject(parent),
     _status(Status::New),
     _direction(direction),
-    _fileName(fileName),
+    _fileName(std::move(fileName)),
     _address(address),
     _port(port),
     _fileSize(fileSize),
-    _nick(nick),
+    _nick(std::move(nick)),
     _uuid(QUuid::createUuid())
 {
     init();
@@ -81,6 +82,9 @@ void Transfer::setStatus(Transfer::Status status)
         _status = status;
         SYNC(ARG(status));
         emit statusChanged(status);
+        if (status == Status::Completed || status == Status::Failed) {
+            cleanUp();
+        }
     }
 }
 
@@ -212,7 +216,6 @@ void Transfer::setError(const QString &errorString)
     qWarning() << Q_FUNC_INFO << errorString;
     emit error(errorString);
     setStatus(Status::Failed);
-    cleanUp();
 }