Merge branch 'master' into 'master'

TEMP FIX? This may leave things hanging in memory but does make housing packup n…

…ot crash the server - it may be something to do with the empty destructors in the backtrace (see comment).

See merge request !22
This commit is contained in:
DarthArgus
2015-11-20 22:12:25 -05:00
@@ -602,7 +602,7 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
{
m_savingSnapshots.erase(i, m_savingSnapshots.end());
delete completedSnapshot;
//delete completedSnapshot;
if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes())
{