summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-02-12 11:56:53 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-02-16 16:41:07 (GMT)
commit40d02d4969bb4fd3c0ec8a6268df1b87c6b9e667 (patch)
tree7ca688a0b1295c40500a59ed834e4b683babc910
parent19c05766a26a6c99385030efa262745998bba76f (diff)
downloadswift-40d02d4969bb4fd3c0ec8a6268df1b87c6b9e667.zip
swift-40d02d4969bb4fd3c0ec8a6268df1b87c6b9e667.tar.bz2
Free ProxyFinder instance after we are done with it
SOCKS5BytestreamProxiesManager will try to stop its ProxyFinder if it exists in its dtor. Test-Information: Running the FileTransferTest crashed before. Now it successfully runs through on Linux. Change-Id: I1e95694a5d32728123ddb436274901e4d8643974
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
index ef0a733..26ad8b5 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp
@@ -117,6 +117,7 @@ void SOCKS5BytestreamProxiesManager::handleProxyFound(S5BProxyRequest::ref proxy
onDiscoveredProxiesChanged();
}
proxyFinder_->stop();
+ proxyFinder_.reset();
}
void SOCKS5BytestreamProxiesManager::handleNameLookupResult(const std::vector<HostAddress>& address, boost::optional<DomainNameResolveError> error, S5BProxyRequest::ref proxy) {