aboutsummaryrefslogtreecommitdiff
path: root/launcher/pages/global
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-11-10 03:02:51 +0100
committerPetr Mrázek <peterix@gmail.com>2021-11-10 03:02:51 +0100
commit475d949a1e384d5de16bea5c90fee115460b4b8b (patch)
tree30501ffd2270e8ebda4ae468dba7dc7efa0942f7 /launcher/pages/global
parent32f9c61c6e0e6cdf1eea2817a9b197f44b0415c5 (diff)
downloadPrismLauncher-475d949a1e384d5de16bea5c90fee115460b4b8b.tar.gz
PrismLauncher-475d949a1e384d5de16bea5c90fee115460b4b8b.tar.bz2
PrismLauncher-475d949a1e384d5de16bea5c90fee115460b4b8b.zip
GH-4217 Add support for GamePass accounts and MC profile setup
- We now use the new endpoint for loggiong in via XBox tokens (/launcher/login) - We now check game entitlements instead of only relying on MC profile presence - Accounts can now be added even when they do not have a profile - The launcher will guide you through selecting a Minecraft name if you don't have one yet
Diffstat (limited to 'launcher/pages/global')
-rw-r--r--launcher/pages/global/AccountListPage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp
index 4f8b8e9c..bf5ab633 100644
--- a/launcher/pages/global/AccountListPage.cpp
+++ b/launcher/pages/global/AccountListPage.cpp
@@ -121,7 +121,7 @@ void AccountListPage::on_actionAddMojang_triggered()
{
m_accounts->addAccount(account);
if (m_accounts->count() == 1) {
- m_accounts->setActiveAccount(account->profileId());
+ m_accounts->setActiveAccount(account);
}
}
}
@@ -149,7 +149,7 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
{
m_accounts->addAccount(account);
if (m_accounts->count() == 1) {
- m_accounts->setActiveAccount(account->profileId());
+ m_accounts->setActiveAccount(account);
}
}
}
@@ -187,13 +187,13 @@ void AccountListPage::on_actionSetDefault_triggered()
{
QModelIndex selected = selection.first();
MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
- m_accounts->setActiveAccount(account->profileId());
+ m_accounts->setActiveAccount(account);
}
}
void AccountListPage::on_actionNoDefault_triggered()
{
- m_accounts->setActiveAccount("");
+ m_accounts->setActiveAccount(nullptr);
}
void AccountListPage::updateButtonStates()