aboutsummaryrefslogtreecommitdiff
path: root/application/LaunchController.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 /application/LaunchController.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 'application/LaunchController.cpp')
-rw-r--r--application/LaunchController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/LaunchController.cpp b/application/LaunchController.cpp
index bebc3db1..3c4491a3 100644
--- a/application/LaunchController.cpp
+++ b/application/LaunchController.cpp
@@ -197,7 +197,7 @@ void LaunchController::launchInstance()
return;
}
- m_launcher = m_instance->createLaunchTask(m_session);
+ m_launcher = m_instance->createLaunchTask(m_session, m_serverToJoin);
if (!m_launcher)
{
emitFailed(tr("Couldn't instantiate a launcher."));