diff options
Diffstat (limited to 'logic/BaseInstance.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 5fa62593..9a811577 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -21,13 +21,13 @@ #include <QDir> #include "MultiMC.h" -#include "inisettingsobject.h" -#include "setting.h" -#include "overridesetting.h" +#include "logic/settings/INISettingsObject.h" +#include "logic/settings/Setting.h" +#include "logic/settings/OverrideSetting.h" #include "pathutils.h" #include <cmdutils.h> -#include "lists/MinecraftVersionList.h" +#include "logic/minecraft/MinecraftVersionList.h" #include "logic/icons/IconList.h" BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir, @@ -58,6 +58,8 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir, // Java Settings settings().registerSetting("OverrideJava", false); + settings().registerSetting("OverrideJavaLocation", false); + settings().registerSetting("OverrideJavaArgs", false); settings().registerOverride(globalSettings->getSetting("JavaPath")); settings().registerOverride(globalSettings->getSetting("JvmArgs")); @@ -104,6 +106,18 @@ QString BaseInstance::id() const return QFileInfo(instanceRoot()).fileName(); } +bool BaseInstance::isRunning() const +{ + I_D(BaseInstance); + return d->m_isRunning; +} + +void BaseInstance::setRunning(bool running) const +{ + I_D(BaseInstance); + d->m_isRunning = running; +} + QString BaseInstance::instanceType() const { I_D(BaseInstance); |