Merge branch 'master' into jgrpp

# Conflicts:
#	src/network/core/tcp_connect.cpp
This commit is contained in:
Jonathan G Rennison
2021-12-06 19:33:36 +00:00
10 changed files with 70 additions and 50 deletions

View File

@@ -566,6 +566,8 @@ void ClientNetworkCoordinatorSocketHandler::ConnectFailure(const std::string &to
*/
void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(const std::string &token, SOCKET sock, NetworkAddress &address)
{
assert(sock != INVALID_SOCKET);
/* Connecter will destroy itself. */
this->game_connecter = nullptr;