swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

if this builds i think it will fix the mem issue

Browse Source
This commit is contained in:
DarthArgus
2016-11-20 06:25:19 -06:00
parent 331dec707b
commit 74ebc3ec43
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/Persister.cpp
-3
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;
@@ -638,7 +636,6 @@ 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;
DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("New character save completed\n"));
}
}
engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
+2
View File
@@ -32,6 +32,8 @@ void TaskSaveSnapshot::onComplete()
{
m_snapshot->saveCompleted();
Persister::getInstance().saveCompleted(m_snapshot);
delete m_snapshot;
m_snapshot = nullptr; // just in case some brilliant SOE BS uses it again somewhere before this class object is nuked
}
// ======================================================================