summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/AccountListDialog.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-01 19:58:13 +0100
commit983a40698c47739fee3786cf54c917004523ea36 (patch)
tree4a0d73577afbf430934cd878ff23674aaa7aea74 /gui/dialogs/AccountListDialog.cpp
parent866d7029afa10293a57d71aecbe3629399c95d06 (diff)
parent1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff)
downloadMultiMC-983a40698c47739fee3786cf54c917004523ea36.tar
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.gz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.lz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.xz
MultiMC-983a40698c47739fee3786cf54c917004523ea36.zip
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'gui/dialogs/AccountListDialog.cpp')
-rw-r--r--gui/dialogs/AccountListDialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index 1712e352..a38035a6 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -126,7 +126,7 @@ void AccountListDialog::addAccount(const QString& errMsg)
MojangAccountPtr account = MojangAccount::createFromUsername(username);
ProgressDialog progDialog(this);
- auto task = account->login(password);
+ auto task = account->login(nullptr, password);
progDialog.exec(task.get());
if(task->successful())
{