From eb44bdc3b318f20661360e069d48f3a17d583797 Mon Sep 17 00:00:00 2001 From: DioEgizio Date: Thu, 26 Mar 2026 21:58:30 +0100 Subject: [PATCH] fix: fix PRISMLAUNCHER_JAVA_PATHS also set Launcher_ENVName as parent scope directly Signed-off-by: DioEgizio --- launcher/java/JavaUtils.cpp | 2 +- program_info/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 868ce5875..43d6bbf68 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -156,7 +156,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava() QStringList addJavasFromEnv(QList javas) { - auto env = qEnvironmentVariable("%1_JAVA_PATHS").arg(BuildConfig.LAUNCHER_ENVNAME); + auto env = QProcessEnvironment::systemEnvironment().value(QStringLiteral("%1_JAVA_PATHS").arg(BuildConfig.LAUNCHER_ENVNAME)); #if defined(Q_OS_WIN32) QList javaPaths = env.replace("\\", "/").split(QLatin1String(";")); diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index 4c30dab49..3afd8a642 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -11,13 +11,12 @@ endif() set(Launcher_CommonName "PrismLauncher") set(Launcher_DisplayName "Prism Launcher") set(Launcher_AppID "org.prismlauncher.PrismLauncher") -set(Launcher_ENVName "PRISMLAUNCHER") set(Launcher_Domain "prismlauncher.org") set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher") set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) -set(Launcher_ENVName "${Launcher_ENVName}" PARENT_SCOPE) +set(Launcher_ENVName "PRISMLAUNCHER" PARENT_SCOPE) set(Launcher_Domain "${Launcher_Domain}" PARENT_SCOPE) set(Launcher_Git "${Launcher_Git}" PARENT_SCOPE)