1 files changed, 12 insertions, 3 deletions
diff --git a/Swiften/Network/ChainedConnector.cpp b/Swiften/Network/ChainedConnector.cpp
index ac48d20..3cc4057 100644
--- a/Swiften/Network/ChainedConnector.cpp
+++ b/Swiften/Network/ChainedConnector.cpp
@@ -1,20 +1,21 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <Swiften/Network/ChainedConnector.h>
-#include <boost/bind.hpp>
 #include <typeinfo>
+#include <boost/bind.hpp>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/foreach.h>
-#include <Swiften/Network/Connector.h>
 #include <Swiften/Network/ConnectionFactory.h>
+#include <Swiften/Network/Connector.h>
 using namespace Swift;
 ChainedConnector::ChainedConnector(
                const std::string& hostname, 
@@ -30,10 +31,18 @@ ChainedConnector::ChainedConnector(
                        connectionFactories(connectionFactories), 
                        timerFactory(timerFactory), 
                        timeoutMilliseconds(0) {
 }
+ChainedConnector::~ChainedConnector() {
+        if (currentConnector) {
+                currentConnector->onConnectFinished.disconnect(boost::bind(&ChainedConnector::handleConnectorFinished, this, _1, _2));
+                currentConnector->stop();
+                currentConnector.reset();
+        }
+}
 void ChainedConnector::setTimeoutMilliseconds(int milliseconds) {
        timeoutMilliseconds = milliseconds;
 }
 void ChainedConnector::start() {