diff options
Diffstat (limited to 'application/LaunchController.cpp')
| -rw-r--r-- | application/LaunchController.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/application/LaunchController.cpp b/application/LaunchController.cpp index e8f369be..2e711933 100644 --- a/application/LaunchController.cpp +++ b/application/LaunchController.cpp @@ -23,18 +23,18 @@ LaunchController::LaunchController(QObject *parent) : Task(parent) void LaunchController::executeTask() { - login(); -} - -// FIXME: minecraft specific -void LaunchController::login() -{ if (!m_instance) { emitFailed(tr("No instance specified")); return; } + login(); +} + +// FIXME: minecraft specific +void LaunchController::login() +{ JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget); // Find an account to use. @@ -103,7 +103,7 @@ void LaunchController::login() progDialog.setSkipButton(true, tr("Play Offline")); } progDialog.execWithTask(task.get()); - if (!task->successful()) + if (!task->wasSuccessful()) { auto failReasonNew = task->failReason(); if(failReasonNew == "Invalid token.") @@ -192,7 +192,7 @@ void LaunchController::launchInstance() Q_ASSERT_X(m_instance != NULL, "launchInstance", "instance is NULL"); Q_ASSERT_X(m_session.get() != nullptr, "launchInstance", "session is NULL"); - if(!m_instance->reload()) + if(!m_instance->reloadSettings()) { QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't load the instance profile.")); emitFailed(tr("Couldn't load the instance profile.")); |