ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disconnecting of a client.

Browse Source
This commit is contained in:
hiker 2015-12-01 08:19:48 +11:00
parent bcfec98fa2
commit c9a23bcbb7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/protocols/client_lobby_room_protocol.cpp
View File

@ -138,6 +138,7 @@ void ClientLobbyRoomProtocol::voteLaps(uint8_t laps, uint8_t track_nb)
void ClientLobbyRoomProtocol::leave() void ClientLobbyRoomProtocol::leave()
{ {
m_server->disconnect(); m_server->disconnect();
STKHost::get()->removePeer(m_server);
m_server_address.clear(); m_server_address.clear();
} // leave } // leave
@ -364,6 +365,7 @@ void ClientLobbyRoomProtocol::disconnectedPlayer(Event* event)
Log::error("ClientLobbyRoomProtocol", Log::error("ClientLobbyRoomProtocol",
"The disconnected peer wasn't known."); "The disconnected peer wasn't known.");
} }
STKHost::get()->removePeer(event->getPeer());
} // disconnectedPlayer } // disconnectedPlayer
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
src/network/protocols/server_lobby_room_protocol.cpp
View File

@ -398,9 +398,9 @@ void ServerLobbyRoomProtocol::kartDisconnected(Event* event)
sendMessage(msg); sendMessage(msg);
Log::info("ServerLobbyRoomProtocol", "Player disconnected : id %d", Log::info("ServerLobbyRoomProtocol", "Player disconnected : id %d",
peer->getPlayerProfile()->getPlayerID()); peer->getPlayerProfile()->getPlayerID());
m_setup->removePlayer(peer->getPlayerProfile());
// Remove the profile from the peer (to avoid double free) // Remove the profile from the peer (to avoid double free)
peer->setPlayerProfile(NULL); peer->setPlayerProfile(NULL);
m_setup->removePlayer(peer->getPlayerProfile());
STKHost::get()->removePeer(peer); STKHost::get()->removePeer(peer);
} }
else else