Remove possible memleak with lingering outdoor pvp capturepoints - patch by ge0rg

--HG--
branch : trunk

2 files changed, 4 insertions, 3 deletions

diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index b19dc01ccd9..8d669e8c72d 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -222,7 +222,11 @@ void OPvPCapturePoint::DeleteSpawns()
 void OutdoorPvP::DeleteSpawns()
 {
     for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
+    {
         itr->second->DeleteSpawns();
+        delete itr->second;
+    }
+    m_capturePoints.clear();
 }
 
 OutdoorPvP::OutdoorPvP() : m_sendUpdate(true)
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index 1ec2bcb6a9c..7098bfa4e6f 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -36,10 +36,7 @@ OutdoorPvPMgr::~OutdoorPvPMgr()
 {
     //sLog.outDebug("Deleting OutdoorPvPMgr");
     for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
-    {
-        (*itr)->DeleteSpawns();
         delete *itr;
-    }
 }
 
 void OutdoorPvPMgr::InitOutdoorPvP()