Merge remote-tracking branch 'origin/develop' into download-all-blocked

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>

1 files changed, 13 insertions, 4 deletions

diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
index d3035272..6a1eb7a0 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
@@ -4,6 +4,7 @@
 
 #include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
+#include "net/NetUtils.h"
 
 MinecraftProfileStepMojang::MinecraftProfileStepMojang(AccountData* data) : AuthStep(data) {
 
@@ -67,10 +68,18 @@ void MinecraftProfileStepMojang::onRequestDone(
         qWarning() << " Response:";
         qWarning() << QString::fromUtf8(data);
 
-        emit finished(
-            AccountTaskState::STATE_FAILED_SOFT,
-            tr("Minecraft Java profile acquisition failed.")
-        );
+        if (Net::isApplicationError(error)) {
+            emit finished(
+                AccountTaskState::STATE_FAILED_SOFT,
+                tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_)
+            );
+        }
+        else {
+            emit finished(
+                AccountTaskState::STATE_OFFLINE,
+                tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_)
+            );
+        }
         return;
     }
     if(!Parsers::parseMinecraftProfileMojang(data, m_data->minecraftProfile)) {