From 019ae0828341a2317000168ded2c98c78f6b772a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 19 Dec 2023 20:43:38 -0500 Subject: [PATCH] Fix ffxivboot.exe check and move steam message box warning after it Prevents some spam when using this unsupported mode --- launcher/src/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 7fcaa76..5a95c09 100755 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -92,17 +92,17 @@ int main(int argc, char *argv[]) } if (parser.isSet(steamOption)) { + const QStringList args = parser.positionalArguments(); + // Steam tries to use as a compatibility tool, running installation scripts (like DirectX), so try to ignore it. + if (!args.empty() && !args.join(QLatin1Char(';')).contains("ffxivboot.exe"_L1)) { + return 0; + } + #ifndef ENABLE_STEAM QMessageBox::warning(nullptr, i18n("Warning"), i18n("You somehow launched Astra through Steam, despite it not being compiled with Steam support. Some features may not work!")); #endif - - const QStringList args = parser.positionalArguments(); - // Steam tries to use as a compatibility tool, running installation scripts (like DirectX), so try to ignore it. - if (!args.empty() && !args[0].contains("ffxivboot.exe"_L1)) { - return 0; - } } QCoro::Qml::registerTypes();