*Fix a crash caused by removing vehicles when wintergrasp battle ends.

--HG--
branch : trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index 6cd473ff7c7..05cfc75d350 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -736,7 +736,12 @@ void OPvPWintergrasp::EndBattle()
 
     for(uint32 team = 0; team < 2; ++team)
     {
-        VehicleCastSpell(TeamId(team), SPELL_SHUTDOWN_VEHICLE);
+        while(!m_vehicles[team].empty())
+        {
+            Vehicle *veh = *m_vehicles[team].begin();
+            m_vehicles[team].erase(m_vehicles[team].begin());
+            veh->CastSpell(veh, SPELL_SHUTDOWN_VEHICLE, true);
+        }
 
         for(PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
         {