2 files changed, 17 insertions, 8 deletions
diff --git a/Swiften/FileTransfer/IBBSendSession.cpp b/Swiften/FileTransfer/IBBSendSession.cpp
index 04c3b5e..9f41532 100644
--- a/Swiften/FileTransfer/IBBSendSession.cpp
+++ b/Swiften/FileTransfer/IBBSendSession.cpp
@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/IBBSendSession.h>
 
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Queries/IQRouter.h>
-#include <Swiften/FileTransfer/IBBRequest.h>
 #include <Swiften/FileTransfer/BytestreamException.h>
+#include <Swiften/FileTransfer/IBBRequest.h>
+#include <Swiften/Queries/IQRouter.h>
 
 namespace Swift {
 
 IBBSendSession::IBBSendSession(
 		const std::string& id, 
 		const JID& from, 
@@ -41,22 +41,28 @@ IBBSendSession::~IBBSendSession() {
 void IBBSendSession::start() {
 	IBBRequest::ref request = IBBRequest::create(
 			from, to, IBB::createIBBOpen(id, boost::numeric_cast<int>(blockSize)), router);
 	request->onResponse.connect(boost::bind(&IBBSendSession::handleIBBResponse, this, _1, _2));
 	active = true;
 	request->send();
+	currentRequest = request;
 }
 
 void IBBSendSession::stop() {
 	if (active && router->isAvailable()) {
 		IBBRequest::create(from, to, IBB::createIBBClose(id), router)->send();
 	}
+	if (currentRequest) {
+		currentRequest->onResponse.disconnect(boost::bind(&IBBSendSession::handleIBBResponse, this, _1, _2));
+	}
 	finish(boost::optional<FileTransferError>());
 }
 
 void IBBSendSession::handleIBBResponse(IBB::ref, ErrorPayload::ref error) {
+	currentRequest.reset();
+
 	if (!error && active) {
 		if (!bytestream->isFinished()) {
 			sendMoreData();
 		}
 		else {
 			finish(boost::optional<FileTransferError>());
@@ -73,12 +79,13 @@ void IBBSendSession::sendMoreData() {
 		if (!data->empty()) {
 			waitingForData = false;
 			IBBRequest::ref request = IBBRequest::create(from, to, IBB::createIBBData(id, sequenceNumber, *data), router);
 			sequenceNumber++;
 			request->onResponse.connect(boost::bind(&IBBSendSession::handleIBBResponse, this, _1, _2));
 			request->send();
+			currentRequest = request;
 			onBytesSent(data->size());
 		}
 		else {
 			waitingForData = true;
 		}
 	}
diff --git a/Swiften/FileTransfer/IBBSendSession.h b/Swiften/FileTransfer/IBBSendSession.h
index 3b29c23..af8cc12 100644
--- a/Swiften/FileTransfer/IBBSendSession.h
+++ b/Swiften/FileTransfer/IBBSendSession.h
@@ -1,27 +1,28 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/FileTransfer/ReadBytestream.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/IBB.h>
 #include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/IBB.h>
 #include <Swiften/FileTransfer/FileTransferError.h>
+#include <Swiften/FileTransfer/ReadBytestream.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
 	class IQRouter;
+	class IBBRequest;
 
 	class SWIFTEN_API IBBSendSession {
 		public:
 			IBBSendSession(
 					const std::string& id, 
 					const JID& from, 
@@ -61,8 +62,9 @@ namespace Swift {
 			boost::shared_ptr<ReadBytestream> bytestream;
 			IQRouter* router;
 			unsigned int blockSize;
 			int sequenceNumber;
 			bool active;
 			bool waitingForData;
+			boost::shared_ptr<IBBRequest> currentRequest;
 	};
 }