Fix: destroying a TCPConnecter that was still resolving made illegal writes

Basically, we should join the resolve thread before we destruct
the object.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp
index a1e369295..96c82b5af 100644
--- a/src/network/core/tcp_connect.cpp
+++ b/src/network/core/tcp_connect.cpp
@@ -32,13 +32,17 @@ TCPConnecter::TCPConnecter(const std::string &connection_string, uint16 default_
 
 	_tcp_connecters.push_back(this);
 
-	if (!StartNewThread(nullptr, "ottd:resolve", &TCPConnecter::ResolveThunk, this)) {
+	if (!StartNewThread(&this->resolve_thread, "ottd:resolve", &TCPConnecter::ResolveThunk, this)) {
 		this->Resolve();
 	}
 }
 
 TCPConnecter::~TCPConnecter()
 {
+	if (this->resolve_thread.joinable()) {
+		this->resolve_thread.join();
+	}
+
 	for (const auto &socket : this->sockets) {
 		closesocket(socket);
 	}
@@ -187,6 +191,7 @@ void TCPConnecter::Resolve()
 
 	this->ai = ai;
 	this->OnResolved(ai);
+
 	this->is_resolved = true;
 }