diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-08-19 14:26:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-19 14:26:36 +0200 |
| commit | d5a218503001ccfb1c6f1ada5a41edae330cb08e (patch) | |
| tree | cae386785617afdff5cc46dcde8d427bfb4f9ac1 /launcher/java/JavaUtils.cpp | |
| parent | e654e668394a7f2809198ff75553fbc2ba5bac52 (diff) | |
| parent | 26f31e9288f65a9e4eb507382cc00ad940e46b09 (diff) | |
| download | PrismLauncher-d5a218503001ccfb1c6f1ada5a41edae330cb08e.tar.gz PrismLauncher-d5a218503001ccfb1c6f1ada5a41edae330cb08e.tar.bz2 PrismLauncher-d5a218503001ccfb1c6f1ada5a41edae330cb08e.zip | |
Merge pull request #1068 from TayouVR/improvedWindowsJavaCheck
Diffstat (limited to 'launcher/java/JavaUtils.cpp')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 2b19fca0..2f91605b 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -174,11 +174,17 @@ JavaInstallPtr JavaUtils::GetDefaultJava() QStringList addJavasFromEnv(QList<QString> javas) { - QByteArray env = qgetenv("POLYMC_JAVA_PATHS"); + auto env = qEnvironmentVariable("POLYMC_JAVA_PATHS"); #if defined(Q_OS_WIN32) - QList<QString> javaPaths = QString::fromLocal8Bit(env).replace("\\", "/").split(QLatin1String(";")); + QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";")); + + auto envPath = qEnvironmentVariable("PATH"); + QList<QString> javaPathsfromPath = envPath.replace("\\", "/").split(QLatin1String(";")); + for (QString string : javaPathsfromPath) { + javaPaths.append(string + "/javaw.exe"); + } #else - QList<QString> javaPaths = QString::fromLocal8Bit(env).split(QLatin1String(":")); + QList<QString> javaPaths = env.split(QLatin1String(":")); #endif for(QString i : javaPaths) { |