Merge branch 'MultiMC:develop' into develop

This commit is contained in:
Zakhar Afonin
2021-05-25 17:58:05 +03:00
30 changed files with 532 additions and 37 deletions

View File

@@ -218,7 +218,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."));