From 471d3e035cdac3a65f5f8ef2d1685233c7699c71 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Sat, 5 Oct 2024 19:42:34 +0100 Subject: [PATCH] citra_qt: Removed old `-g` option; Software path is now passed as the last parameter instead --- src/citra_qt/main.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 775b5f770..16415847c 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -315,15 +315,6 @@ GMainWindow::GMainWindow(Core::System& system_) continue; } - // Launch game at path - if (args[i] == QStringLiteral("-g")) { - if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) { - continue; - } - game_path = args[++i]; - continue; - } - if (args[i] == QStringLiteral("-p")) { if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) { continue; @@ -347,6 +338,12 @@ GMainWindow::GMainWindow(Core::System& system_) ui->action_Fullscreen->setChecked(false); continue; } + + // Launch game at path + if (i == args.size() - 1 && !args[i].startsWith(QChar::fromLatin1('-'))) { + game_path = args[i]; + continue; + } } if (!game_path.isEmpty()) { @@ -3610,10 +3607,9 @@ static Qt::HighDpiScaleFactorRoundingPolicy GetHighDpiRoundingPolicy() { static void PrintHelp(const char* argv0) { std::cout << "Usage: " << argv0 - << " [options] \n" + << " [options] \n" "-d [path] Dump video recording of emulator playback to the given file path\n" "-f Start in fullscreen mode\n" - "-g [path] Start a game file located at the given path\n" "-h Display this help and exit\n" "-i [path] Install a CIA file at the given path\n" "-p [path] Play a TAS movie located at the given path\n"