diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 8bd434f0..c8f6b780 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -691,6 +691,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
m_settings->registerSetting("LastHostname", "");
m_settings->registerSetting("JvmArgs", "");
m_settings->registerSetting("IgnoreJavaCompatibility", false);
+ m_settings->registerSetting("IgnoreJavaWizard", false);
// Native library workarounds
m_settings->registerSetting("UseNativeOpenAL", false);
@@ -936,6 +937,10 @@ bool Application::createSetupWizard()
{
bool javaRequired = [&]()
{
+ bool ignoreJavaWizard = m_settings->get("IgnoreJavaWizard").toBool();
+ if(ignoreJavaWizard) {
+ return false;
+ }
QString currentHostName = QHostInfo::localHostName();
QString oldHostName = settings()->get("LastHostname").toString();
if (currentHostName != oldHostName)
@@ -966,6 +971,7 @@ bool Application::createSetupWizard()
{
m_setupWizard->addPage(new LanguageWizardPage(m_setupWizard));
}
+
if (javaRequired)
{
m_setupWizard->addPage(new JavaWizardPage(m_setupWizard));
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index f0616db1..b5e8de6c 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -97,6 +97,7 @@ void JavaPage::applySettings()
s->set("JavaPath", ui->javaPathTextBox->text());
s->set("JvmArgs", ui->jvmArgsTextBox->text());
s->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked());
+ s->set("IgnoreJavaWizard", ui->skipJavaWizardCheckbox->isChecked());
JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
}
void JavaPage::loadSettings()
@@ -121,6 +122,7 @@ void JavaPage::loadSettings()
ui->javaPathTextBox->setText(s->get("JavaPath").toString());
ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
ui->skipCompatibilityCheckbox->setChecked(s->get("IgnoreJavaCompatibility").toBool());
+ ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool());
}
void JavaPage::on_javaDetectBtn_clicked()
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index bb195770..7268601f 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -154,6 +154,48 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ J&VM arguments:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ If enabled, the launcher will not check if an instance is compatible with the selected Java version.
+
+
+ &Skip Java compatibility checks
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ &Auto-detect...
+
+
+
-
-
@@ -180,35 +222,6 @@
- -
-
-
- -
-
-
-
- 0
- 0
-
-
-
- J&VM arguments:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- &Auto-detect...
-
-
-
-
@@ -222,19 +235,16 @@
- -
-
-
-
- 0
- 0
-
-
+
-
+
+
+ -
+
- If enabled, the launcher will not check if an instance is compatible with the selected Java version.
+ If enabled, the launcher will not prompt you to choose a Java version if one isn't found.
- &Skip Java compatibility checks
+ Skip Java Wizard
diff --git a/share b/share
new file mode 120000
index 00000000..bf797c5f
--- /dev/null
+++ b/share
@@ -0,0 +1 @@
+cmake-build-debug
\ No newline at end of file