diff options
author | Andrew <forkk@forkk.net> | 2013-03-13 13:25:24 -0500 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-03-13 13:25:24 -0500 |
commit | 8864c7ebdc7c6591f17ed65a474113b66e974488 (patch) | |
tree | 4a8ad6a1e771834f2060fcffd77e2dc820fb5cab /main.cpp | |
parent | f0cb300d04aac77fbe6e03dfdbe201f5f834d886 (diff) | |
parent | 46f93311afc9f1e2afc306f63cee0e4f462758e2 (diff) | |
download | PrismLauncher-8864c7ebdc7c6591f17ed65a474113b66e974488.tar.gz PrismLauncher-8864c7ebdc7c6591f17ed65a474113b66e974488.tar.bz2 PrismLauncher-8864c7ebdc7c6591f17ed65a474113b66e974488.zip |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -81,7 +81,7 @@ private slots: QApplication::instance()->quit(); } - void onLoginComplete(LoginResponse response) + void onLoginComplete(QString instId, LoginResponse response) { // TODO: console console = new ConsoleWindow(); @@ -92,7 +92,7 @@ private slots: proc->launch(); } - void doLogin(const QString &errorMsg) + void doLogin(QString instId, const QString &errorMsg) { LoginDialog* loginDlg = new LoginDialog(nullptr, errorMsg); if (loginDlg->exec()) @@ -100,11 +100,11 @@ private slots: UserInfo uInfo(loginDlg->getUsername(), loginDlg->getPassword()); TaskDialog* tDialog = new TaskDialog(nullptr); - LoginTask* loginTask = new LoginTask(uInfo, tDialog); - connect(loginTask, SIGNAL(loginComplete(LoginResponse)), - SLOT(onLoginComplete(LoginResponse)), Qt::QueuedConnection); - connect(loginTask, SIGNAL(loginFailed(QString)), - SLOT(doLogin(QString)), Qt::QueuedConnection); + LoginTask* loginTask = new LoginTask(uInfo, instance.data()->id(), tDialog); + connect(loginTask, SIGNAL(loginComplete(QString, LoginResponse)), + SLOT(onLoginComplete(QString, LoginResponse)), Qt::QueuedConnection); + connect(loginTask, SIGNAL(loginFailed(QString, QString)), + SLOT(doLogin(QString, QString)), Qt::QueuedConnection); tDialog->exec(loginTask); } //onLoginComplete(LoginResponse("Offline","Offline", 1)); @@ -125,7 +125,7 @@ public: } std::cout << "Logging in..." << std::endl; - doLogin(""); + doLogin(instance->id(),""); return QApplication::instance()->exec(); } |