From 1187ae4f045f1688ba37548d2beaf252104080fe Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 16 Mar 2024 11:08:17 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20#2938:=20=E4=BF=AE=E5=A4=8D=20DefaultLaun?= =?UTF-8?q?cher=20=E4=BC=9A=E5=A4=9A=E6=AC=A1=E6=B7=BB=E5=8A=A0=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=91=BD=E4=BB=A4=E7=9A=84=E9=97=AE=E9=A2=98=20(#2939?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 4bf3bf2d3..2375d762a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -102,7 +102,7 @@ public class DefaultLauncher extends Launcher { // Executable if (StringUtils.isNotBlank(options.getWrapper())) - res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper())); + res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper(), getEnvVars())); res.add(options.getJava().getBinary().toString()); @@ -429,9 +429,6 @@ public class DefaultLauncher extends Launcher { // To guarantee that when failed to generate launch command line, we will not call pre-launch command List rawCommandLine = command.commandLine.asList(); - if (StringUtils.isNotBlank(options.getWrapper())) { - rawCommandLine.addAll(0, StringUtils.tokenize(options.getWrapper(), getEnvVars())); - } if (command.tempNativeFolder != null) { Files.deleteIfExists(command.tempNativeFolder);