From 3c2243269a9401570f13185fef8791a6308743c8 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 1 Jun 2016 15:36:46 +0000 Subject: [PATCH] fix another multimap --- .../CentralServer/src/shared/CentralServer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index 8034bbdb..89562972 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -3006,12 +3006,12 @@ void CentralServer::setTaskManager(TaskConnection * newTaskManager) void CentralServer::removePlanetServer(const PlanetServerConnection * p) { - for (std::map::iterator i = m_planetServers.begin(); i != m_planetServers.end(); ++i) + for (std::map::iterator i = m_planetServers.begin(); i != m_planetServers.end();) { if ((*i).second == p) { DEBUG_REPORT_LOG(true,("Central lost connection to Planet Server %s\n",p->getSceneId().c_str())); - m_planetServers.erase(i); + i = m_planetServers.erase(i); if (isPreloadFinished()) m_timeClusterWentIntoLoadingState = 0; @@ -3020,6 +3020,10 @@ void CentralServer::removePlanetServer(const PlanetServerConnection * p) return; } + else + { + ++i; + } } }