summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
Diffstat (limited to 'logic')
-rw-r--r--logic/BaseInstance.cpp12
-rw-r--r--logic/ftb/FTBPlugin.cpp8
2 files changed, 19 insertions, 1 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 0a0bc961..066d2642 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -153,18 +153,27 @@ qint64 BaseInstance::lastLaunch() const
void BaseInstance::setLastLaunch(qint64 val)
{
+ //FIXME: if no change, do not set. setting involves saving a file.
m_settings->set("lastLaunchTime", val);
emit propertiesChanged(this);
}
void BaseInstance::setGroupInitial(QString val)
{
+ if(m_group == val)
+ {
+ return;
+ }
m_group = val;
emit propertiesChanged(this);
}
void BaseInstance::setGroupPost(QString val)
{
+ if(m_group == val)
+ {
+ return;
+ }
setGroupInitial(val);
emit groupChanged();
}
@@ -176,6 +185,7 @@ QString BaseInstance::group() const
void BaseInstance::setNotes(QString val)
{
+ //FIXME: if no change, do not set. setting involves saving a file.
m_settings->set("notes", val);
}
@@ -186,6 +196,7 @@ QString BaseInstance::notes() const
void BaseInstance::setIconKey(QString val)
{
+ //FIXME: if no change, do not set. setting involves saving a file.
m_settings->set("iconKey", val);
emit propertiesChanged(this);
}
@@ -197,6 +208,7 @@ QString BaseInstance::iconKey() const
void BaseInstance::setName(QString val)
{
+ //FIXME: if no change, do not set. setting involves saving a file.
m_settings->set("name", val);
emit propertiesChanged(this);
}
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index ea663bab..0130b41e 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -161,13 +161,19 @@ InstancePtr loadInstance(SettingsObjectPtr globalSettings, QMap<QString, QString
inst->init();
qDebug() << "Init " << record.instanceDir;
inst->setGroupInitial("FTB");
+ /**
+ * FIXME: this does not respect the user's preferences. BUT, it would work nicely with the planned pack support
+ * -> instead of changing the user values, change pack values (defaults you can look at and revert to)
+ */
+ /*
inst->setName(record.name);
inst->setIconKey(record.iconKey);
+ inst->setNotes(record.description);
+ */
if (inst->intendedVersionId() != record.mcVersion)
{
inst->setIntendedVersionId(record.mcVersion);
}
- inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir;
if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
{