diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-11 00:08:39 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-11 00:08:39 +0100 |
| commit | 018f3289933be0b03364975528c1d8071f486e62 (patch) | |
| tree | dfec4d4984e769712452884c91775bba2d622808 | |
| parent | fa2ba01a17c650e828b03d29622aadb3638e702f (diff) | |
| parent | ecf7bcf18443a0a1bef4407d2a31129009e72c5a (diff) | |
| download | MultiMC-018f3289933be0b03364975528c1d8071f486e62.tar MultiMC-018f3289933be0b03364975528c1d8071f486e62.tar.gz MultiMC-018f3289933be0b03364975528c1d8071f486e62.tar.lz MultiMC-018f3289933be0b03364975528c1d8071f486e62.tar.xz MultiMC-018f3289933be0b03364975528c1d8071f486e62.zip | |
Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 into develop
| -rw-r--r-- | gui/MainWindow.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index f115f090..80bde381 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -513,7 +513,7 @@ void MainWindow::on_actionAddInstance_triggered() newInstance->setName(newInstDlg.instName()); newInstance->setIconKey(newInstDlg.iconKey()); MMC->instances()->add(InstancePtr(newInstance)); - return; + break; case InstanceFactory::InstExists: { @@ -536,6 +536,19 @@ void MainWindow::on_actionAddInstance_triggered() break; } } + + std::shared_ptr<MojangAccountList> accounts = MMC->accounts(); + MojangAccountPtr account = accounts->activeAccount(); + if(account.get() != nullptr && account->accountStatus() != NotVerified) + { + ProgressDialog loadDialog(this); + auto update = newInstance->doUpdate(false); + connect(update.get(), &Task::failed , [this](QString reason) { + QString error = QString("Instance load failed: %1").arg(reason); + CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show(); + }); + loadDialog.exec(update.get()); + } } void MainWindow::on_actionCopyInstance_triggered() |