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

1 files changed, 6 insertions, 0 deletions

diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 459447c8..1d8cd1d7 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -50,6 +50,7 @@
 #include "Application.h"
 
 #include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
 #include "FileSystem.h"
 
 
@@ -362,6 +363,11 @@ void InstanceSettingsPage::loadSettings()
 
 void InstanceSettingsPage::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);