From c8ca6acc1571486297db957935c1bf650a34258c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 5 Dec 2021 03:48:07 +0100 Subject: [PATCH] NOISSUE fix some error mappings for Mojang accounts --- launcher/LaunchController.cpp | 7 ++----- launcher/minecraft/auth/steps/YggdrasilStep.cpp | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp index 39fec9e6..a0458168 100644 --- a/launcher/LaunchController.cpp +++ b/launcher/LaunchController.cpp @@ -175,6 +175,8 @@ void LaunchController::login() { } return; } + case AccountState::Errored: + // This means some sort of soft error that we can fix with a refresh ... so let's refresh. case AccountState::Unchecked: { m_accountToUse->refresh(); // NOTE: fallthrough intentional @@ -196,11 +198,6 @@ void LaunchController::login() { return; } */ - case AccountState::Errored: { - // This means some sort of soft error that we can fix with a refresh ... so let's refresh. - // TODO: implement - return; - } case AccountState::Expired: { auto errorString = tr("The account has expired and needs to be logged into manually again."); QMessageBox::warning( diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.cpp b/launcher/minecraft/auth/steps/YggdrasilStep.cpp index ac6ad798..4c6b1624 100644 --- a/launcher/minecraft/auth/steps/YggdrasilStep.cpp +++ b/launcher/minecraft/auth/steps/YggdrasilStep.cpp @@ -47,5 +47,5 @@ void YggdrasilStep::onAuthFailed() { state = AccountTaskState::STATE_OFFLINE; errorMessage = tr("Mojang user authentication ended with a network error."); } - emit finished(AccountTaskState::STATE_OFFLINE, errorMessage); + emit finished(state, errorMessage); }