3 files changed, 8 insertions, 0 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
index dffc39b..ca29898 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
@@ -70,13 +70,18 @@ DefaultFileTransferTransporter::DefaultFileTransferTransporter(
 	remoteCandidateSelector->onCandidateSelectFinished.connect(
 		boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
 }
 
 DefaultFileTransferTransporter::~DefaultFileTransferTransporter() {
 	stopGeneratingLocalCandidates();
+	remoteCandidateSelector->onCandidateSelectFinished.disconnect(
+		boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
 	delete remoteCandidateSelector;
+
+	localCandidateGenerator->onLocalTransportCandidatesGenerated.disconnect(
+		boost::bind(&DefaultFileTransferTransporter::handleLocalCandidatesGenerated, this, _1));
 	delete localCandidateGenerator;
 }
 
 void DefaultFileTransferTransporter::initialize() {
 	s5bSessionID = s5bRegistry->generateSessionID();
 }
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
index 04d5d86..a38501b 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
@@ -39,12 +39,14 @@ SOCKS5BytestreamClientSession::SOCKS5BytestreamClientSession(
 	weFailedTimeout = timerFactory->createTimer(3000);
 	weFailedTimeout->onTick.connect(
 			boost::bind(&SOCKS5BytestreamClientSession::handleWeFailedTimeout, this));
 }
 
 SOCKS5BytestreamClientSession::~SOCKS5BytestreamClientSession() {
+	weFailedTimeout->onTick.disconnect(
+			boost::bind(&SOCKS5BytestreamClientSession::handleWeFailedTimeout, this));
 	weFailedTimeout->stop();
 }
 
 void SOCKS5BytestreamClientSession::start() {
 	assert(state == Initial);
 	SWIFT_LOG(debug) << "Trying to connect via TCP to " << addressPort.toString() << "." << std::endl;
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
index 25a12ea..3221790 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
@@ -110,12 +110,13 @@ boost::shared_ptr<SOCKS5BytestreamClientSession> SOCKS5BytestreamProxiesManager:
 boost::shared_ptr<SOCKS5BytestreamClientSession> SOCKS5BytestreamProxiesManager::createSOCKS5BytestreamClientSession(HostAddressPort addressPort, const std::string& destAddr) {
 	SOCKS5BytestreamClientSession::ref connection = boost::make_shared<SOCKS5BytestreamClientSession>(connectionFactory_->createConnection(), addressPort, destAddr, timerFactory_);
 	return connection;
 }
 
 void SOCKS5BytestreamProxiesManager::handleProxiesFound(std::vector<S5BProxyRequest::ref> proxyHosts) {
+	proxyFinder_->onProxiesFound.disconnect(boost::bind(&SOCKS5BytestreamProxiesManager::handleProxiesFound, this, _1));
 	foreach(S5BProxyRequest::ref proxy, proxyHosts) {
 		if (proxy) {
 			if (HostAddress(proxy->getStreamHost().get().host).isValid()) {
 				addS5BProxy(proxy);
 				onDiscoveredProxiesChanged();
 			}