diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
| commit | 930b07afd4229e952d0cd47ca62cd94235499a0c (patch) | |
| tree | 34cd74c3652da4b3ad0fd008faa2ab67adb4901f /logic/InstanceLauncher.cpp | |
| parent | 5cd3420c46e0b54f1479ddf720a8c9131c460a5e (diff) | |
| parent | b979d0ce5da515793a02802a6421ef607a498323 (diff) | |
| download | MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.gz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.lz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.xz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.zip | |
Merge branch 'feature_library_model' into develop
Diffstat (limited to 'logic/InstanceLauncher.cpp')
| -rw-r--r-- | logic/InstanceLauncher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/InstanceLauncher.cpp b/logic/InstanceLauncher.cpp index a0557b37..f2f792c9 100644 --- a/logic/InstanceLauncher.cpp +++ b/logic/InstanceLauncher.cpp @@ -3,7 +3,7 @@ #include <iostream> #include "gui/logindialog.h" -#include "gui/taskdialog.h" +#include "gui/ProgressDialog.h" #include "gui/consolewindow.h" #include "logic/tasks/LoginTask.h" #include "logic/MinecraftProcess.h" @@ -48,7 +48,7 @@ void InstanceLauncher::doLogin ( const QString& errorMsg ) { UserInfo uInfo {loginDlg->getUsername(), loginDlg->getPassword() }; - TaskDialog* tDialog = new TaskDialog ( nullptr ); + ProgressDialog* tDialog = new ProgressDialog ( nullptr ); LoginTask* loginTask = new LoginTask ( uInfo, tDialog ); connect ( loginTask, SIGNAL ( succeeded() ),SLOT ( onLoginComplete() ), Qt::QueuedConnection ); connect ( loginTask, SIGNAL ( failed ( QString ) ),SLOT ( doLogin ( QString ) ), Qt::QueuedConnection ); |