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

well according to SO this looks correct https://stackoverflow.com/questions/991335/how-to-erase-delete-pointers-to-objects-stored-in-a-vector

Browse Source
This commit is contained in:
DarthArgus
2016-11-20 07:47:19 -06:00
parent cceff1dc1a
commit 23cf1cc584
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/Persister.cpp
+6 -4
View File
@@ -602,8 +602,9 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
SnapshotListType::iterator i=std::remove(m_savingSnapshots.begin(),m_savingSnapshots.end(),completedSnapshot);
if (i!=m_savingSnapshots.end())
{
delete (*i);
m_savingSnapshots.erase(i, m_savingSnapshots.end());
delete *i;
i = m_savingSnapshots.erase(i, m_savingSnapshots.end());
*i = nullptr;
if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes())
{
@@ -636,8 +637,9 @@ 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."));
delete (*j);
m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
delete *j;
*j = nullptr;
j = m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("New character save completed\n"));
}
}