Reset m_state after timeout is reset in setup

This commit is contained in:
Benau 2019-03-17 01:27:07 +08:00
parent 92ffcb22bc
commit 5b4ae2a59f

View File

@ -3135,8 +3135,6 @@ void ServerLobby::resetServer()
{ {
addWaitingPlayersToGame(); addWaitingPlayersToGame();
resetPeersReady(); resetPeersReady();
m_state = NetworkConfig::get()->isLAN() ?
WAITING_FOR_START_GAME : REGISTER_SELF_ADDRESS;
updatePlayerList(true/*update_when_reset_server*/); updatePlayerList(true/*update_when_reset_server*/);
NetworkString* server_info = getNetworkString(); NetworkString* server_info = getNetworkString();
server_info->setSynchronous(true); server_info->setSynchronous(true);
@ -3145,6 +3143,8 @@ void ServerLobby::resetServer()
sendMessageToPeersInServer(server_info); sendMessageToPeersInServer(server_info);
delete server_info; delete server_info;
setup(); setup();
m_state = NetworkConfig::get()->isLAN() ?
WAITING_FOR_START_GAME : REGISTER_SELF_ADDRESS;
} // resetServer } // resetServer
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------