CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #511 from dada513/hide_java_wizard

Browse Source 
add hide java wizard toggle
This commit is contained in:
dada513
2022-05-01 08:48:37 +02:00
committed by GitHub
parent 1d95f10090 5662d41062
commit 8110040f86
3 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/Application.cpp
View File

@ -628,6 +628,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);
@ -873,6 +874,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)
@ -903,6 +908,7 @@ bool Application::createSetupWizard()
{
m_setupWizard->addPage(new LanguageWizardPage(m_setupWizard));
}
if (javaRequired)
{
m_setupWizard->addPage(new JavaWizardPage(m_setupWizard));