Merge pull request #794 from Scrumplex/resolve-jars-dynamically

2022-07-06 17:40:09 +02:00
parent 04b865adae 474d77ac57
commit f1902a4471
13 changed files with 87 additions and 19 deletions
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@ -127,6 +127,11 @@ void JavaPage::loadSettings()

 void JavaPage::on_javaDetectBtn_clicked()
 {
+    if (JavaUtils::getJavaCheckPath().isEmpty()) {
+        JavaCommon::javaCheckNotFound(this);
+        return;
+    }
+
    JavaInstallPtr java;

    VersionSelectDialog vselect(APPLICATION->javalist().get(), tr("Select a Java version"), this, true);