summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-28 14:50:12 -0600
committerAndrew <forkk@forkk.net>2013-11-28 14:50:12 -0600
commita914e8bd2465302067dad949747d0557b3fcd0ae (patch)
treef57e44d507ba26cd699bf26bfc0eced26ac5e380 /logic
parentfec8c054c3967d9ed4bbf288b9c4993b8aaeac1d (diff)
parent191e850cf14666302c3338d69073d1f417925a45 (diff)
downloadMultiMC-a914e8bd2465302067dad949747d0557b3fcd0ae.tar
MultiMC-a914e8bd2465302067dad949747d0557b3fcd0ae.tar.gz
MultiMC-a914e8bd2465302067dad949747d0557b3fcd0ae.tar.lz
MultiMC-a914e8bd2465302067dad949747d0557b3fcd0ae.tar.xz
MultiMC-a914e8bd2465302067dad949747d0557b3fcd0ae.zip
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into feature_yggdrasil
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();
}