From a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 27 Nov 2013 16:14:18 -0600 Subject: Allow setting no default account This allows the user to select an account to use every time they launch an instance. --- logic/lists/MojangAccountList.cpp | 13 ++++++++++--- logic/lists/MojangAccountList.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'logic/lists') diff --git a/logic/lists/MojangAccountList.cpp b/logic/lists/MojangAccountList.cpp index 1d67c70f..a30ef4ab 100644 --- a/logic/lists/MojangAccountList.cpp +++ b/logic/lists/MojangAccountList.cpp @@ -93,9 +93,16 @@ MojangAccountPtr MojangAccountList::activeAccount() const void MojangAccountList::setActiveAccount(const QString& username) { beginResetModel(); - for (MojangAccountPtr account : m_accounts) - if (account->username() == username) - m_activeAccount = username; + if (username.isEmpty()) + { + m_activeAccount = ""; + } + else + { + for (MojangAccountPtr account : m_accounts) + if (account->username() == username) + m_activeAccount = username; + } endResetModel(); onListChanged(); } diff --git a/logic/lists/MojangAccountList.h b/logic/lists/MojangAccountList.h index 71f472f7..cfe96c11 100644 --- a/logic/lists/MojangAccountList.h +++ b/logic/lists/MojangAccountList.h @@ -122,6 +122,7 @@ public: /*! * Sets the given account as the current active account. + * If the username given is an empty string, sets the active account to nothing. */ virtual void setActiveAccount(const QString& username); -- cgit v1.2.3