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

3 files changed, 15 insertions, 1 deletions

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;
 
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 65a8b1db..24a1556e 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -24,6 +24,7 @@
 #include "java/JavaUtils.h"
 #include "java/JavaInstallList.h"
 #include "FileSystem.h"
+#include "Application.h"
 
 #define IBUS "@im=ibus"
 
@@ -437,3 +438,8 @@ QList<QString> JavaUtils::FindJavaPaths()
     return addJavasFromEnv(javas);
 }
 #endif
+
+QString JavaUtils::getJavaCheckPath()
+{
+    return APPLICATION->getJarPath("JavaCheck.jar");
+}
diff --git a/launcher/java/JavaUtils.h b/launcher/java/JavaUtils.h
index 3152d143..26d8003b 100644
--- a/launcher/java/JavaUtils.h
+++ b/launcher/java/JavaUtils.h
@@ -39,4 +39,6 @@ public:
 #ifdef Q_OS_WIN
     QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName, QString keyJavaDir, QString subkeySuffix = "");
 #endif
+
+    static QString getJavaCheckPath();
 };