diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-11 02:21:26 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-11 02:21:26 +0100 |
| commit | 498520446fcd10003226822f5ada9c2fe90e8c63 (patch) | |
| tree | 3890b0fb70c8b5bb9d08a8052a91d10bcc285b32 | |
| parent | d52079e73464dcdcc9b15862c9a610634a9db5a3 (diff) | |
| parent | c00946c855e868e3146468481bc540160d4d3d3f (diff) | |
| download | MultiMC-498520446fcd10003226822f5ada9c2fe90e8c63.tar MultiMC-498520446fcd10003226822f5ada9c2fe90e8c63.tar.gz MultiMC-498520446fcd10003226822f5ada9c2fe90e8c63.tar.lz MultiMC-498520446fcd10003226822f5ada9c2fe90e8c63.tar.xz MultiMC-498520446fcd10003226822f5ada9c2fe90e8c63.zip | |
Merge https://github.com/Drayshak/MultiMC5 into develop
| -rw-r--r-- | gui/MainWindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 31e4b9e4..dba15e98 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -235,17 +235,20 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi connect(MMC->accounts().get(), &MojangAccountList::listChanged, [this] { repopulateAccountsMenu(); }); - std::shared_ptr<MojangAccountList> accounts = MMC->accounts(); + // Show initial account + activeAccountChanged(); + + auto accounts = MMC->accounts(); // TODO: Nicer way to iterate? for (int i = 0; i < accounts->count(); i++) { - MojangAccountPtr account = accounts->at(i); + auto account = accounts->at(i); if (account != nullptr) { auto job = new NetJob("Startup player skins: " + account->username()); - for (AccountProfile profile : account->profiles()) + for (auto profile : account->profiles()) { auto meta = MMC->metacache()->resolveEntry("skins", profile.name + ".png"); auto action = CacheDownload::make( |