redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 03:37:47 +00:00
Code Activity

Actually return to the main page if a login error occurs in auto-login

Browse source
This commit is contained in:
Joshua Goins 2025-02-01 09:58:38 -05:00
parent 788918e4b8
commit e3709a4dd1
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
launcher/src/squareenixlogin.cpp
View file

@ -393,6 +393,7 @@ QCoro::Task<bool> SquareEnixLogin::registerSession()
std::string bodyStd = body.toStdString(); std::string bodyStd = body.toStdString();
const bool hasPatched = co_await m_patcher->patch(physis_parse_patchlist(PatchListType::Game, bodyStd.c_str())); const bool hasPatched = co_await m_patcher->patch(physis_parse_patchlist(PatchListType::Game, bodyStd.c_str()));
m_patcher->deleteLater(); m_patcher->deleteLater();
qInfo() << hasPatched;
if (!hasPatched) { if (!hasPatched) {
co_return false; co_return false;
} }

13
launcher/ui/Pages/StatusPage.qml
View file

@ -2,12 +2,15 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick import QtQuick
import QtQuick.Window
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
import zone.xiv.astra import zone.xiv.astra
Kirigami.Page { Kirigami.Page {
id: root
property var gameInstaller property var gameInstaller
title: i18n("Logging in...") title: i18n("Logging in...")
@ -34,8 +37,8 @@ Kirigami.Page {
showCloseButton: false showCloseButton: false
standardButtons: Kirigami.Dialog.Ok standardButtons: Kirigami.Dialog.Ok
onAccepted: applicationWindow().pageStack.layers.pop() onAccepted: applicationWindow().checkSetup()
onRejected: applicationWindow().pageStack.layers.pop() onRejected: applicationWindow().checkSetup()
} }
Kirigami.PromptDialog { Kirigami.PromptDialog {
@ -47,9 +50,9 @@ Kirigami.Page {
onAccepted: { onAccepted: {
LauncherCore.currentProfile.dalamudEnabled = false; LauncherCore.currentProfile.dalamudEnabled = false;
applicationWindow().pageStack.layers.pop() applicationWindow().checkSetup();
} }
onRejected: applicationWindow().pageStack.layers.pop() onRejected: applicationWindow().checkSetup()
} }
Connections { Connections {
@ -88,4 +91,4 @@ Kirigami.Page {
dalamudErrorDialog.open(); dalamudErrorDialog.open();
} }
} }
} }