From 70d44f97dc80d06e77dfaa36de6ae11efd3d5d65 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 20 Nov 2012 12:48:00 +0100 Subject: Core/ObjectMgr: Fixed crash on shutdown Closes #8362 --- src/server/game/Globals/ObjectMgr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index a94a12a99fe..ff734efe385 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -264,16 +264,20 @@ ObjectMgr::~ObjectMgr() // free only if loaded for (int class_ = 0; class_ < MAX_CLASSES; ++class_) { - delete[] _playerClassInfo[class_]->levelInfo; + if (_playerClassInfo[class_]) + delete[] _playerClassInfo[class_]->levelInfo; delete _playerClassInfo[class_]; } for (int race = 0; race < MAX_RACES; ++race) + { for (int class_ = 0; class_ < MAX_CLASSES; ++class_) { - delete[] _playerInfo[race][class_]->levelInfo; + if (_playerInfo[race][class_]) + delete[] _playerInfo[race][class_]->levelInfo; delete _playerInfo[race][class_]; } + } for (CacheVendorItemContainer::iterator itr = _cacheVendorItemStore.begin(); itr != _cacheVendorItemStore.end(); ++itr) itr->second.Clear(); -- cgit v1.2.3