1 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/Disco/DiscoServiceWalker.cpp b/Swiften/Disco/DiscoServiceWalker.cpp
index f84262b..5803602 100644
--- a/Swiften/Disco/DiscoServiceWalker.cpp
+++ b/Swiften/Disco/DiscoServiceWalker.cpp
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <Swiften/Disco/DiscoServiceWalker.h>
+#include <boost/bind.hpp>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/foreach.h>
-#include <boost/bind.hpp>
 namespace Swift {
 DiscoServiceWalker::DiscoServiceWalker(const JID& service, IQRouter* iqRouter, size_t maxSteps) : service_(service), iqRouter_(iqRouter), maxSteps_(maxSteps), active_(false) {
 }
@@ -55,10 +55,11 @@ void DiscoServiceWalker::handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> in
                return;
        }
        SWIFT_LOG(debug) << "Disco info response from " << request->getReceiver() << std::endl;
+        request->onResponse.disconnect(boost::bind(&DiscoServiceWalker::handleDiscoInfoResponse, this, _1, _2, request));
        pendingDiscoInfoRequests_.erase(request);
        if (error) {
                handleDiscoError(request->getReceiver(), error);
                return;
        }
@@ -89,10 +90,11 @@ void DiscoServiceWalker::handleDiscoItemsResponse(boost::shared_ptr<DiscoItems>
        if (!active_) {
                return;
        }
        SWIFT_LOG(debug) << "Received disco items from " << request->getReceiver() << std::endl;
+        request->onResponse.disconnect(boost::bind(&DiscoServiceWalker::handleDiscoItemsResponse, this, _1, _2, request));
        pendingDiscoItemsRequests_.erase(request);
        if (error) {
                handleDiscoError(request->getReceiver(), error);
                return;
        }