summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-03-02 15:19:47 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-03-28 11:07:37 (GMT)
commit692db2695485697a62729e5a6188e033e076c20d (patch)
treedcfd16db1077e8a26ee1e49265d76b06e06f972e
parent7f84bd25373ef37c25460d573ef21398ee649eed (diff)
downloadswift-692db2695485697a62729e5a6188e033e076c20d.zip
swift-692db2695485697a62729e5a6188e033e076c20d.tar.bz2
Fix a bug in successful file-transfer termination in IncomingJingleFT
IncomingJingleFileTransfer::terminate already sets the finshed state for the file-transfer. Test-Information: Verified in the logs that onFinished signal is only called once. Change-Id: Ib2084e1487ded2a921f61b237cd036e1ae4cf992
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
index 7c91c6a..a0cd47c 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
@@ -176,12 +176,10 @@ void IncomingJingleFileTransfer::handleSessionTerminateReceived(boost::optional<
void IncomingJingleFileTransfer::checkHashAndTerminate() {
if (verifyData()) {
terminate(JinglePayload::Reason::Success);
- setFinishedState(FileTransfer::State::Finished, FileTransferError());
}
else {
SWIFT_LOG(warning) << "Hash verification failed" << std::endl;
terminate(JinglePayload::Reason::MediaError);
- setFinishedState(FileTransfer::State::Failed, FileTransferError());
}
}