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

Remove the keys too after selection

Browse Source
This commit is contained in:
Benau 2018-06-04 13:47:37 +08:00
parent 4ef0c4e03c
commit a08e46f279
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/protocols/server_lobby.cpp
View File

@ -592,14 +592,6 @@ void ServerLobby::startSelection(const Event *event)
return;
}
// Drop all pending players
for (auto& p : m_pending_connection)
{
if (auto peer = p.first.lock())
peer->disconnect();
}
m_pending_connection.clear();
if (m_server_registered)
{
unregisterServer(false/*now*/);
@ -648,6 +640,16 @@ void ServerLobby::startSelection(const Event *event)
delete ns;
m_state = SELECTING;
// Drop all pending players and keys
for (auto& p : m_pending_connection)
{
if (auto peer = p.first.lock())
peer->disconnect();
}
m_pending_connection.clear();
std::unique_lock<std::mutex> ul(m_keys_mutex);
m_keys.clear();
ul.unlock();
// Will be changed after the first vote received
m_timeout.store(std::numeric_limits<float>::max());