1 files changed, 21 insertions, 2 deletions
diff --git a/Swiften/Network/PlatformDomainNameResolver.cpp b/Swiften/Network/PlatformDomainNameResolver.cpp
index e30615b..3636cd6 100644
--- a/Swiften/Network/PlatformDomainNameResolver.cpp
+++ b/Swiften/Network/PlatformDomainNameResolver.cpp
@@ -4,12 +4,13 @@
 #include "Swiften/Network/PlatformDomainNameServiceQuery.h"
 
 #include <string>
 #include <vector>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <boost/thread.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <idna.h>
 #include <algorithm>
 
 #include "Swiften/Base/String.h"
 #include "Swiften/Network/HostAddress.h"
@@ -18,15 +19,30 @@
 #include "Swiften/Network/DomainNameAddressQuery.h"
 
 using namespace Swift;
 
 namespace {
 	struct AddressQuery : public DomainNameAddressQuery, public boost::enable_shared_from_this<AddressQuery>, public EventOwner {
-		AddressQuery(const String& host) : hostname(host) {}
+		AddressQuery(const String& host) : hostname(host), thread(NULL), safeToJoin(false) {}
 
-		virtual void run() {
+		~AddressQuery() {
+			if (safeToJoin) {
+				thread->join();
+			}
+			else {
+				// FIXME: UGLYYYYY
+			}
+			delete thread;
+		}
+
+		void run() {
+			safeToJoin = false;
+			thread = new boost::thread(boost::bind(&AddressQuery::doRun, shared_from_this()));
+		}
+		
+		void doRun() {
 			boost::asio::ip::tcp::resolver resolver(ioService);
 			boost::asio::ip::tcp::resolver::query query(hostname.getUTF8String(), "5222");
 			try {
 				boost::asio::ip::tcp::resolver::iterator endpointIterator = resolver.resolve(query);
 				if (endpointIterator == boost::asio::ip::tcp::resolver::iterator()) {
 					emitError();
@@ -39,20 +55,23 @@ namespace {
 							shared_from_this());
 				}
 			}
 			catch (...) {
 				emitError();
 			}
+			safeToJoin = true;
 		}
 
 		void emitError() {
 			MainEventLoop::postEvent(boost::bind(boost::ref(onResult), HostAddress(), boost::optional<DomainNameResolveError>(DomainNameResolveError())), shared_from_this());
 		}
 
 		boost::asio::io_service ioService;
 		String hostname;
+		boost::thread* thread;
+		bool safeToJoin;
 	};
 
 	String getNormalized(const String& domain) {
 		char* output;
 		if (idna_to_ascii_8z(domain.getUTF8Data(), &output, 0) == IDNA_SUCCESS) {
 			String result(output);