aboutsummaryrefslogtreecommitdiff
path: root/api/logic/minecraft/launch/DirectJavaLaunch.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@users.noreply.github.com>2021-05-24 02:41:54 +0200
committerGitHub <noreply@github.com>2021-05-24 02:41:54 +0200
commit60b686f01458fc1f31109a0be71d790b8f7ec22b (patch)
treeb6a7d10a24517a5971a712e949c7a9c340f56e0c /api/logic/minecraft/launch/DirectJavaLaunch.cpp
parent3a8068e75f4f818417f17c524af928ba295e775a (diff)
parent52c1150522139f042903321387c6582a99e8ad9a (diff)
downloadPrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.tar.gz
PrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.tar.bz2
PrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.zip
Merge pull request #3804 from Janrupf/feature/default-server
Add ability to select a server to join in the instance settings
Diffstat (limited to 'api/logic/minecraft/launch/DirectJavaLaunch.cpp')
-rw-r--r--api/logic/minecraft/launch/DirectJavaLaunch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
index d9841a43..cf4564b6 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.cpp
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
@@ -55,7 +55,7 @@ void DirectJavaLaunch::executeTask()
// make detachable - this will keep the process running even if the object is destroyed
m_process.setDetachable(true);
- auto mcArgs = minecraftInstance->processMinecraftArgs(m_session);
+ auto mcArgs = minecraftInstance->processMinecraftArgs(m_session, m_serverToJoin);
args.append(mcArgs);
QString wrapperCommandStr = instance->getWrapperCommand().trimmed();