Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo

2023-11-23 16:23:56 +02:00
parent 50a4d61ded 7f6027498e
commit be67067fa2
72 changed files with 334 additions and 224 deletions
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -36,6 +36,7 @@

 #include "LaunchController.h"
 #include "Application.h"
+#include "minecraft/auth/AccountData.h"
 #include "minecraft/auth/AccountList.h"

 #include "ui/InstanceWindow.h"
@@ -212,7 +213,7 @@ void LaunchController::login()
        m_accountToUse->fillSession(m_session);

        // Launch immediately in true offline mode
-        if (m_accountToUse->isOffline()) {
+        if (m_accountToUse->accountType() == AccountType::Offline) {
            launchInstance();
            return;
        }