fix conflict
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
0ee5665c95
commit
14ad720c58
1 changed files with 1 additions and 2 deletions
|
@ -324,8 +324,7 @@ bool LaunchController::reauthenticateCurrentAccount()
|
||||||
bool isDefault = accounts->defaultAccount() == m_accountToUse;
|
bool isDefault = accounts->defaultAccount() == m_accountToUse;
|
||||||
accounts->removeAccount(accounts->index(accounts->findAccountByProfileId(m_accountToUse->profileId())));
|
accounts->removeAccount(accounts->index(accounts->findAccountByProfileId(m_accountToUse->profileId())));
|
||||||
if (m_accountToUse->accountType() == AccountType::MSA) {
|
if (m_accountToUse->accountType() == AccountType::MSA) {
|
||||||
auto newAccount =
|
auto newAccount = MSALoginDialog::newAccount(m_parentWidget);
|
||||||
MSALoginDialog::newAccount(m_parentWidget, tr("Please enter your Mojang account email and password to add your account."));
|
|
||||||
accounts->addAccount(newAccount);
|
accounts->addAccount(newAccount);
|
||||||
if (isDefault) {
|
if (isDefault) {
|
||||||
accounts->setDefaultAccount(newAccount);
|
accounts->setDefaultAccount(newAccount);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue