From 3236670a6a78388a5f270fb54d6084fb0af9eb75 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Mon, 29 Sep 2014 19:41:35 +0300 Subject: [PATCH] [transfer-engine] Finish activity prior to firing the statusChanged event The statusChanged() event is wired to TransferEnginePrivate::exitSafely() which would otherwise think that something is still going on and wouldn't exit, so transfer engine would keep on running forever. Which is what it currently does. --- src/transferengine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/transferengine.cpp b/src/transferengine.cpp index c560d1b..7339115 100644 --- a/src/transferengine.cpp +++ b/src/transferengine.cpp @@ -1153,6 +1153,7 @@ void TransferEngine::finishTransfer(int transferId, int status, const QString &r transferStatus == TransferEngineData::TransferInterrupted) { DbManager::instance()->updateTransferStatus(transferId, transferStatus); d->sendNotification(type, transferStatus, fileName); + d->m_activityMonitor->activityFinished(transferId); emit statusChanged(transferId, status); bool notify = false; @@ -1174,8 +1175,6 @@ void TransferEngine::finishTransfer(int transferId, int status, const QString &r if (notify) { emit transfersChanged(); } - - d->m_activityMonitor->activityFinished(transferId); } }