From c38d77d0871222cec303d57e3665ca0cc15ae743 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 5 May 2025 16:00:42 -0400 Subject: [PATCH] With no pre-existing accounts, go straight to the "new account" page There's no point in showing the user the pre-existing account list if they don't have any! --- launcher/ui/Main.qml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml index 3a65295..ba08f48 100644 --- a/launcher/ui/Main.qml +++ b/launcher/ui/Main.qml @@ -60,9 +60,17 @@ Kirigami.ApplicationWindow { }) } else if (!LauncherCore.currentProfile.account && !LauncherCore.currentProfile.config.isBenchmark) { // User must select an account for the profile - pageStack.push(Qt.createComponent("zone.xiv.astra", "AccountSetup"), { - profile: LauncherCore.currentProfile - }) + if (LauncherCore.accountManager.hasAnyAccounts()) { + // They have another account they could select + pageStack.push(Qt.createComponent("zone.xiv.astra", "AccountSetup"), { + profile: LauncherCore.currentProfile + }); + } else { + // They have no pre-existing accounts, and should be shoved into the new account page + pageStack.layers.push(Qt.createComponent("zone.xiv.astra", "AddSquareEnix"), { + profile: LauncherCore.currentProfile + }); + } } else { if (LauncherCore.autoLoginProfile && !checkedAutoLogin) { pageStack.layers.push(Qt.createComponent("zone.xiv.astra", "AutoLoginPage"))