0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatically try to set the Java path on first start

Browse Source
This commit is contained in:
Sky 2013-10-06 23:44:34 +01:00
parent 8450807c06
commit 58547d3867
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MultiMC.cpp
View File

@ -16,6 +16,8 @@
#include "logic/InstanceLauncher.h" #include "logic/InstanceLauncher.h"
#include "logic/net/HttpMetaCache.h" #include "logic/net/HttpMetaCache.h"
#include "logic/JavaUtils.h"
#include "pathutils.h" #include "pathutils.h"
#include "cmdutils.h" #include "cmdutils.h"
#include <inisettingsobject.h> #include <inisettingsobject.h>
@ -260,7 +262,18 @@ void MultiMC::initGlobalSettings()
m_settings->registerSetting(new Setting("PermGen", 64)); m_settings->registerSetting(new Setting("PermGen", 64));
// Java Settings // 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", "")); m_settings->registerSetting(new Setting("JvmArgs", ""));
// Custom Commands // Custom Commands