summaryrefslogtreecommitdiffstats
path: root/logic/BaseInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-09 01:29:18 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-09 01:38:31 +0200
commit171325d42784a69ac3cadc6ab330603e258eec02 (patch)
tree6485fc30e3c106e512134dccddb95b384f7b77e6 /logic/BaseInstance.cpp
parentbe73eb3322b6bb5ab1144f9942ef9bd188c704a1 (diff)
downloadMultiMC-171325d42784a69ac3cadc6ab330603e258eec02.tar
MultiMC-171325d42784a69ac3cadc6ab330603e258eec02.tar.gz
MultiMC-171325d42784a69ac3cadc6ab330603e258eec02.tar.lz
MultiMC-171325d42784a69ac3cadc6ab330603e258eec02.tar.xz
MultiMC-171325d42784a69ac3cadc6ab330603e258eec02.zip
Instance settings moved to a page.
Diffstat (limited to 'logic/BaseInstance.cpp')
-rw-r--r--logic/BaseInstance.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 59aada40..0088530f 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -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"));