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/java/JavaChecker.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'launcher/java/JavaChecker.cpp')

diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index 946599c5..15b22260 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -16,7 +16,13 @@ JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
 
 void JavaChecker::performCheck()
 {
-    QString checkerJar = FS::PathCombine(APPLICATION->getJarsPath(), "JavaCheck.jar");
+    QString checkerJar = JavaUtils::getJavaCheckPath();
+
+    if (checkerJar.isEmpty())
+    {
+        qDebug() << "Java checker library could not be found. Please check your installation.";
+        return;
+    }
 
     QStringList args;
 
-- 
cgit