diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-06 17:40:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 17:40:09 +0200 |
| commit | f1902a44716201d9d6431cab762663cd749b58eb (patch) | |
| tree | 4f952a91312804ab44cd12bb7db10b044eadce0c /launcher/launch | |
| parent | 04b865adaec8f7af1a148e004c67c0483dbcc67b (diff) | |
| parent | 474d77ac574c24918759413c2a77dc657e1e8581 (diff) | |
| download | PrismLauncher-f1902a44716201d9d6431cab762663cd749b58eb.tar.gz PrismLauncher-f1902a44716201d9d6431cab762663cd749b58eb.tar.bz2 PrismLauncher-f1902a44716201d9d6431cab762663cd749b58eb.zip | |
Merge pull request #794 from Scrumplex/resolve-jars-dynamically
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(); |