Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-03-01 21:00:49 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-03-27 23:01:57 (GMT) |
| commit | 1d09d9ead06be72ee0c4026aa027cd90e6f1546b (patch) | |
| tree | 02864423c5a06a29fafabcc3e2fdd764fd831806 /Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp | |
| parent | dde0c6a3d4c437d7178f5db628feb4f3a04a22f2 (diff) | |
| download | swift-1d09d9ead06be72ee0c4026aa027cd90e6f1546b.zip swift-1d09d9ead06be72ee0c4026aa027cd90e6f1546b.tar.bz2 | |
Fix OutgoingJingleFileTransferTest and enable it again
Test-Information:
Unit tests pass.
Change-Id: I793fb65fd2e760daddab0142abc33d4aa5b4fce5
Diffstat (limited to 'Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp')
| -rw-r--r-- | Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp index 7ff1a08..aabbd2d 100644 --- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp +++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp @@ -126,6 +126,9 @@ void OutgoingJingleFileTransfer::handleSessionTerminateReceived(boost::optional< if (state == Finished) { SWIFT_LOG(warning) << "Incorrect state: " << state << std::endl; return; } stopAll(); + if (state == WaitForTermination) { + waitForRemoteTermination->stop(); + } if (reason && reason->type == JinglePayload::Reason::Cancel) { setFinishedState(FileTransfer::State::Canceled, FileTransferError(FileTransferError::PeerError)); } |