diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-06-14 22:00:24 +0200 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-03 17:31:01 +0200 |
commit | 474d77ac574c24918759413c2a77dc657e1e8581 (patch) | |
tree | d1a516863a97caec0443e949580017c8d9a91cc2 /launcher/launch | |
parent | 412fdb0f7b363e91d4f4ef3e973f29ab2b5a3613 (diff) | |
download | PrismLauncher-474d77ac574c24918759413c2a77dc657e1e8581.tar.gz PrismLauncher-474d77ac574c24918759413c2a77dc657e1e8581.tar.bz2 PrismLauncher-474d77ac574c24918759413c2a77dc657e1e8581.zip |
feat: resolve JARs dynamically
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/launch')
-rw-r--r-- | launcher/launch/steps/CheckJava.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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(); |