1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
index 43d3e46..3137163 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -192,6 +192,10 @@ void SOCKS5BytestreamServerManager::stop() {
 		forwardPortRequest->stop();
 		forwardPortRequest.reset();
 	}
+	if (server) {
+		server->stop();
+		server = NULL;
+	}
 	if (connectionServer) {
 		connectionServer->stop();
 		connectionServer.reset();
@@ -223,6 +227,7 @@ void SOCKS5BytestreamServerManager::handleForwardPortResult(boost::optional<NATP
 	}
 
 	portMapping = mapping;
+	onPortForwardingSetup(mapping.is_initialized());
 
 	forwardPortRequest->stop();
 	forwardPortRequest.reset();