*Do not register zone if opvp setup failed. This fixes related crash.

--HG--
branch : trunk

1 files changed, 1 insertions, 2 deletions

diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index 4cc447f72b3..d604507a799 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -56,8 +56,6 @@ typedef std::list<const AreaPOIEntry *> AreaPOIList;
 
 bool OPvPWintergrasp::SetupOutdoorPvP()
 {
-    RegisterZone(ZONE_WINTERGRASP);
-
     m_defender = TeamId(rand()%2);
     //m_defender = TEAM_ALLIANCE;
 
@@ -132,6 +130,7 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
     m_wartime = false;
     m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME) * MINUTE * IN_MILISECONDS;
 
+    RegisterZone(ZONE_WINTERGRASP);
     return true;
 }