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

Enable refresh of server list after exiting a connection again. Also

Browse Source 
removed deleting the joined server.
This commit is contained in:
hiker
2015-11-28 12:45:03 +11:00
parent 73e94e9824
commit 18e5cd8d53
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/servers_manager.cpp
View File

@@ -60,8 +60,6 @@ ServersManager::ServersManager()
ServersManager::~ServersManager()
{
cleanUpServers();
MutexLocker(m_joined_server);
delete m_joined_server.getData();
} // ~ServersManager
// ------------------------------------------------------------------------
@@ -272,15 +270,8 @@ const Server* ServersManager::getQuickPlay() const
*/
void ServersManager::setJoinedServer(uint32_t id)
{
{
MutexLocker(m_joined_server);
delete m_joined_server.getData();
}
{
MutexLocker(m_mapped_servers);
m_joined_server.getData() = m_mapped_servers.getData().at(id);
}
MutexLocker(m_mapped_servers);
m_joined_server.getData() = m_mapped_servers.getData().at(id);
} // setJoinedServer
// ----------------------------------------------------------------------------
@@ -289,7 +280,6 @@ void ServersManager::setJoinedServer(uint32_t id)
void ServersManager::unsetJoinedServer()
{
MutexLocker(m_joined_server);
delete m_joined_server.getData();
m_joined_server.getData() = NULL;
} // unsetJoinedServer

1
src/network/stk_host.cpp
View File

@@ -271,6 +271,7 @@ void STKHost::requestShutdown()
*/
void STKHost::shutdown()
{
ServersManager::get()->unsetJoinedServer();
ProtocolManager::getInstance()->abort();
deleteAllPeers();
destroy();