From 5b4ae2a59f68d13e88fabd67353a0d89f5981aeb Mon Sep 17 00:00:00 2001 From: Benau Date: Sun, 17 Mar 2019 01:27:07 +0800 Subject: [PATCH] Reset m_state after timeout is reset in setup --- src/network/protocols/server_lobby.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/protocols/server_lobby.cpp b/src/network/protocols/server_lobby.cpp index b1049eaae..035f7e310 100644 --- a/src/network/protocols/server_lobby.cpp +++ b/src/network/protocols/server_lobby.cpp @@ -3135,8 +3135,6 @@ void ServerLobby::resetServer() { addWaitingPlayersToGame(); resetPeersReady(); - m_state = NetworkConfig::get()->isLAN() ? - WAITING_FOR_START_GAME : REGISTER_SELF_ADDRESS; updatePlayerList(true/*update_when_reset_server*/); NetworkString* server_info = getNetworkString(); server_info->setSynchronous(true); @@ -3145,6 +3143,8 @@ void ServerLobby::resetServer() sendMessageToPeersInServer(server_info); delete server_info; setup(); + m_state = NetworkConfig::get()->isLAN() ? + WAITING_FOR_START_GAME : REGISTER_SELF_ADDRESS; } // resetServer //-----------------------------------------------------------------------------