From 474d77ac574c24918759413c2a77dc657e1e8581 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 14 Jun 2022 22:00:24 +0200
Subject: feat: resolve JARs dynamically

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/launch/steps/CheckJava.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'launcher/launch')

diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp
index ef5db2c9..db56b652 100644
--- a/launcher/launch/steps/CheckJava.cpp
+++ b/launcher/launch/steps/CheckJava.cpp
@@ -34,6 +34,7 @@
  */
 
 #include "CheckJava.h"
+#include "java/JavaUtils.h"
 #include <launch/LaunchTask.h>
 #include <FileSystem.h>
 #include <QStandardPaths>
@@ -71,6 +72,14 @@ void CheckJava::executeTask()
         emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::Launcher);
     }
 
+    if (JavaUtils::getJavaCheckPath().isEmpty())
+    {
+        const char *reason = QT_TR_NOOP("Java checker library could not be found. Please check your installation.");
+        emit logLine(tr(reason), MessageLevel::Fatal);
+        emitFailed(tr(reason));
+        return;
+    }
+
     QFileInfo javaInfo(realJavaPath);
     qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
     auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
-- 
cgit