From a26bfaadcdceb4a35be382a73f4d3f34200da9ce Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 16 Jan 2016 03:09:19 -0600 Subject: [PATCH] revert another mistake --- .../ATGenericAPI/GenericApiCore.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp old mode 100755 new mode 100644 index ecf507b6..6c412225 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp @@ -85,7 +85,7 @@ GenericAPICore::GenericAPICore(const char *game, const char *hosts[], GenericAPICore::~GenericAPICore() //---------------------------------------- { - for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter) + for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++) { GenericConnection *con = *conIter; delete con; @@ -97,6 +97,8 @@ GenericAPICore::~GenericAPICore() delete (*iter).second; } + m_pending.empty(); + while(m_outCount > 0) { delete m_outboundQueue.front().second; @@ -198,7 +200,7 @@ void GenericAPICore::process() } } - for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter) + for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++) { GenericConnection *con = *conIter; con->process(); @@ -245,7 +247,7 @@ void GenericAPICore::countOpenConnections() m_currentConnections = 0; m_maxConnections = m_serverConnections.size(); - for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter) + for (std::vector::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++) { GenericConnection *con = *conIter; if (con->isConnected())