diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-29 02:02:38 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-29 02:02:38 +0200 |
| commit | 903fbb6be74c4664aed1b981f9f75e2678323bb0 (patch) | |
| tree | 6d2ab7bdf8c0e182f0f829e4f2bc6080703588a0 /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | fc687effce3c877c8e4b02110973bf416a2ccdd5 (diff) | |
| parent | 833195062c310685b479ed16ff4ac5ef5664c021 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index e37e6847bdd..9f565c8d58d 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -39,8 +39,10 @@ uint16 InstanceSaveManager::ResetTimeDelay[] = {3600, 900, 300, 60}; InstanceSaveManager::~InstanceSaveManager() { - // it is undefined whether this or objectmgr will be unloaded first - // so we must be prepared for both cases +} + +void InstanceSaveManager::Unload() +{ lock_instLists = true; for (InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) { |