swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-29 16:13:07 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-11-20 21:44:19 +00:00
parent fc4116b544 1867ee7cc9
commit 8036ae2472
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/Persister.cpp
+8 -4
View File
@@ -604,8 +604,6 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
{
m_savingSnapshots.erase(i, m_savingSnapshots.end());
delete completedSnapshot;
if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes())
{
int saveTime = Clock::timeMs() - m_saveStartTime;
@@ -637,10 +635,16 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
{
SnapshotListType::iterator j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot);
DEBUG_FATAL(i==m_savingCharacterSnapshots.end(),("Programmer bug: SaveCompleted() called with a snapshot that wasn't in m_savingSnapshots or m_savingCharacterSnapshots."));
m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
delete completedSnapshot;
m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("New character save completed\n"));
}
if (completedSnapshot) {
delete completedSnapshot;
completedSnapshot = nullptr; // in case of double deletes by any other pointers to this thing
} else {
DEBUG_WARNING(true, ("We just attempted a double delete!"));
}
}
// ----------------------------------------------------------------------