AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-04 03:46:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2938: 修复 DefaultLauncher 会多次添加包装命令的问题 (#2939)

Browse Source
This commit is contained in:
Glavo 2024-03-16 11:08:17 +08:00 committed by GitHub
parent 8efdc536ee
commit 1187ae4f04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@ -102,7 +102,7 @@ public class DefaultLauncher extends Launcher {
// Executable // Executable
if (StringUtils.isNotBlank(options.getWrapper())) if (StringUtils.isNotBlank(options.getWrapper()))
res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper())); res.addAllWithoutParsing(StringUtils.tokenize(options.getWrapper(), getEnvVars()));
res.add(options.getJava().getBinary().toString()); 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 // To guarantee that when failed to generate launch command line, we will not call pre-launch command
List<String> rawCommandLine = command.commandLine.asList(); List<String> rawCommandLine = command.commandLine.asList();
if (StringUtils.isNotBlank(options.getWrapper())) {
rawCommandLine.addAll(0, StringUtils.tokenize(options.getWrapper(), getEnvVars()));
}
if (command.tempNativeFolder != null) { if (command.tempNativeFolder != null) {
Files.deleteIfExists(command.tempNativeFolder); Files.deleteIfExists(command.tempNativeFolder);