aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorTayou <tayou@gmx.net>2022-08-18 18:19:28 +0200
committerTayou <tayou@gmx.net>2022-08-18 18:24:32 +0200
commitbb4861cf0d5b133da5b18a77700a3b827d2c7d13 (patch)
treeefbf73d3fc062df389506516e892681558e51b21 /launcher
parentab766a05989adbe3fcb61e8ca865e2dab5b2cc74 (diff)
downloadPrismLauncher-bb4861cf0d5b133da5b18a77700a3b827d2c7d13.tar.gz
PrismLauncher-bb4861cf0d5b133da5b18a77700a3b827d2c7d13.tar.bz2
PrismLauncher-bb4861cf0d5b133da5b18a77700a3b827d2c7d13.zip
check for java installs in PATH on windows
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable. Signed-off-by: Tayou <tayou@gmx.net>
Diffstat (limited to 'launcher')
-rw-r--r--launcher/java/JavaUtils.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 2b19fca0..078b22b9 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -177,6 +177,12 @@ QStringList addJavasFromEnv(QList<QString> javas)
QByteArray env = qgetenv("POLYMC_JAVA_PATHS");
#if defined(Q_OS_WIN32)
QList<QString> javaPaths = QString::fromLocal8Bit(env).replace("\\", "/").split(QLatin1String(";"));
+
+ QByteArray envPath = qgetenv("PATH");
+ QList<QString> javaPathsfromPath = QString::fromLocal8Bit(envPath).replace("\\", "/").split(QLatin1String(";"));
+ for (QString string : javaPathsfromPath) {
+ javaPaths.append(string + "/javaw.exe");
+ }
#else
QList<QString> javaPaths = QString::fromLocal8Bit(env).split(QLatin1String(":"));
#endif