3 files changed, 16 insertions, 0 deletions
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 025771e8..2cee15bf 100644
--- 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);
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);
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 340518b1..f0765909 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -11,6 +11,7 @@
 
 #include <sys.h>
 
+#include "JavaCommon.h"
 #include "java/JavaInstall.h"
 #include "java/JavaUtils.h"
 #include "FileSystem.h"
@@ -133,6 +134,10 @@ void JavaSettingsWidget::initialize()
 
 void JavaSettingsWidget::refresh()
 {
+    if (JavaUtils::getJavaCheckPath().isEmpty()) {
+        JavaCommon::javaCheckNotFound(this);
+        return;
+    }
     m_versionWidget->loadList();
 }