summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-11-28 21:28:32 +0100
committerPetr Mrázek <peterix@gmail.com>2013-11-28 21:28:32 +0100
commit61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52 (patch)
treef57e44d507ba26cd699bf26bfc0eced26ac5e380 /logic
parentfec8c054c3967d9ed4bbf288b9c4993b8aaeac1d (diff)
parent191e850cf14666302c3338d69073d1f417925a45 (diff)
downloadMultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar
MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.gz
MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.lz
MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.xz
MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.zip
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'logic')
-rw-r--r--logic/lists/MojangAccountList.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/lists/MojangAccountList.cpp b/logic/lists/MojangAccountList.cpp
index a30ef4ab..c6dce836 100644
--- a/logic/lists/MojangAccountList.cpp
+++ b/logic/lists/MojangAccountList.cpp
@@ -100,8 +100,10 @@ void MojangAccountList::setActiveAccount(const QString& username)
else
{
for (MojangAccountPtr account : m_accounts)
+ {
if (account->username() == username)
m_activeAccount = username;
+ }
}
endResetModel();
onListChanged();
@@ -113,7 +115,9 @@ void MojangAccountList::onListChanged()
if (m_autosave)
// TODO: Alert the user if this fails.
saveList();
- emit listChanged();
+
+ // TODO: stop this getting called from setActiveAccount
+ //emit listChanged();
}