1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff --git c/launcher/Application.cpp w/launcher/Application.cpp
index b8dcc1099..29a84ba85 100644
--- c/launcher/Application.cpp
+++ w/launcher/Application.cpp
@@ -1094,7 +1094,7 @@ bool Application::createSetupWizard()
bool pasteInterventionRequired = settings()->get("PastebinURL") != "";
bool validWidgets = m_themeManager->isValidApplicationTheme(settings()->get("ApplicationTheme").toString());
bool validIcons = m_themeManager->isValidIconTheme(settings()->get("IconTheme").toString());
- bool login = !m_accounts->anyAccountIsValid() && capabilities() & Application::SupportsMSA;
+ bool login = false;
bool themeInterventionRequired = !validWidgets || !validIcons;
bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired || askjava || login;
if (wizardRequired) {
diff --git c/launcher/LaunchController.cpp w/launcher/LaunchController.cpp
index 687da1322..2bab547e8 100644
--- c/launcher/LaunchController.cpp
+++ w/launcher/LaunchController.cpp
@@ -84,27 +84,8 @@ void LaunchController::decideAccount()
return;
}
- // Find an account to use.
- auto accounts = APPLICATION->accounts();
- if (accounts->count() <= 0 || !accounts->anyAccountIsValid()) {
- // Tell the user they need to log in at least one account in order to play.
- auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
- tr("In order to play Minecraft, you must have at least one Microsoft "
- "account which owns Minecraft logged in. "
- "Would you like to open the account manager to add an account now?"),
- QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
- ->exec();
-
- if (reply == QMessageBox::Yes) {
- // Open the account manager.
- APPLICATION->ShowGlobalSettings(m_parentWidget, "accounts");
- } else if (reply == QMessageBox::No) {
- // Do not open "profile select" dialog.
- return;
- }
- }
-
// Select the account to use. If the instance has a specific account set, that will be used. Otherwise, the default account will be used
+ auto accounts = APPLICATION->accounts();
auto instanceAccountId = m_instance->settings()->get("InstanceAccountId").toString();
auto instanceAccountIndex = accounts->findAccountByProfileId(instanceAccountId);
if (instanceAccountIndex == -1 || instanceAccountId.isEmpty()) {
diff --git c/launcher/ui/pages/global/AccountListPage.cpp w/launcher/ui/pages/global/AccountListPage.cpp
index 041b8faff..90eb6becf 100644
--- c/launcher/ui/pages/global/AccountListPage.cpp
+++ w/launcher/ui/pages/global/AccountListPage.cpp
@@ -141,14 +141,6 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
void AccountListPage::on_actionAddOffline_triggered()
{
- if (!m_accounts->anyAccountIsValid()) {
- QMessageBox::warning(this, tr("Error"),
- tr("You must add a Microsoft account that owns Minecraft before you can add an offline account."
- "<br><br>"
- "If you have lost your account you can contact Microsoft for support."));
- return;
- }
-
MinecraftAccountPtr account =
OfflineLoginDialog::newAccount(this, tr("Please enter your desired username to add your offline account."));
|
