diff options
| author | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
| commit | 0bf8d9df5cc102fcec496ba3c5cf15477e726516 (patch) | |
| tree | 47a22f0353953061a532f103c9d9a92a18a427f9 /MultiMC.cpp | |
| parent | d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (diff) | |
| parent | b30a97d4c9315e482341ec863dc5722bf78c4631 (diff) | |
| download | MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.gz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.lz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.xz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.zip | |
Merge pull request #3 from Drayshak/develop
Fix window size setting for 1.6+, improve Windows Java detection
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index ef720c33..be1b86da 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -16,6 +16,8 @@ #include "logic/InstanceLauncher.h" #include "logic/net/HttpMetaCache.h" +#include "logic/JavaUtils.h" + #include "pathutils.h" #include "cmdutils.h" #include <inisettingsobject.h> @@ -260,7 +262,18 @@ void MultiMC::initGlobalSettings() m_settings->registerSetting(new Setting("PermGen", 64)); // Java Settings - m_settings->registerSetting(new Setting("JavaPath", "java")); + m_settings->registerSetting(new Setting("JavaPath", "")); + QString currentJavaPath = m_settings->get("JavaPath").toString(); + if(currentJavaPath.isEmpty()) + { + QLOG_INFO() << "Java path not set, attempting to set it automatically..."; + + JavaUtils jut; + auto javas = jut.FindJavaPaths(); + + m_settings->set("JavaPath", std::get<JI_PATH>(javas.at(0))); + } + m_settings->registerSetting(new Setting("JvmArgs", "")); // Custom Commands |