diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2013-08-25 12:14:50 -0700 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2013-08-25 12:14:50 -0700 |
| commit | 39ccd4a4604c9b73f000aa7558c58bfc81c56206 (patch) | |
| tree | 889a49480246f660f1668810bdf98ee0b3388c5f /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | eeb2102d5f5f469e9cdc9cbdb99e83455eaf97e2 (diff) | |
| parent | a3bdf90b0aa6ca99c65d0562c3d6275bb2ad8a1b (diff) | |
Merge pull request #10624 from jackpoz/instancesavemgr
Core/Instances: Fix mutex released after being deleted
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index a422fd8531c..6370eda6568 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -156,14 +156,14 @@ void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId) CharacterDatabase.Execute(stmt); } - delete itr->second; + itr->second->SetToDelete(true); m_instanceSaveById.erase(itr); } } InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, bool canReset) : m_resetTime(resetTime), m_instanceid(InstanceId), m_mapid(MapId), - m_difficulty(difficulty), m_canReset(canReset) + m_difficulty(difficulty), m_canReset(canReset), m_toDelete(false) { } |