CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE force saving of any outstanding instance component state on exit

Browse Source
This commit is contained in:
Petr Mrázek
2017-12-03 18:36:28 +01:00
parent e0bea1e46a
commit 95e6f37d39
10 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/logic/minecraft/ComponentList.cpp
View File

@ -43,16 +43,12 @@ ComponentList::ComponentList(MinecraftInstance * instance)
d->m_instance = instance;
d->m_saveTimer.setSingleShot(true);
d->m_saveTimer.setInterval(5000);
connect(&d->m_saveTimer, &QTimer::timeout, this, &ComponentList::save);
connect(&d->m_saveTimer, &QTimer::timeout, this, &ComponentList::save_internal);
}
ComponentList::~ComponentList()
{
if(saveIsScheduled())
{
d->m_saveTimer.stop();
save();
}
saveNow();
}
// BEGIN: component file format
@ -212,6 +208,15 @@ static bool loadComponentList(ComponentList * parent, const QString & filename,
// BEGIN: save/load logic
void ComponentList::saveNow()
{
if(saveIsScheduled())
{
d->m_saveTimer.stop();
save_internal();
}
}
bool ComponentList::saveIsScheduled() const
{
return d->dirty;
@ -253,7 +258,7 @@ QString ComponentList::patchFilePathForUid(const QString& uid) const
return patchesPattern().arg(uid);
}
void ComponentList::save()
void ComponentList::save_internal()
{
qDebug() << "Component list save performed now for" << d->m_instance->name();
auto filename = componentsFilePath();
@ -321,10 +326,7 @@ void ComponentList::reload(Net::Mode netmode)
}
// flush any scheduled saves to not lose state
if(saveIsScheduled())
{
save();
}
saveNow();
// FIXME: differentiate when a reapply is required by propagating state from components
invalidateLaunchProfile();