From 7cf037bd492c40b8bde6951e379b6cbee22f3f70 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 25 Aug 2019 09:40:55 +0200 Subject: [PATCH] Fix cli args and app version/name --- rpcs3/main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index 6ea868aa75..2efbfed3cc 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -1,4 +1,4 @@ -// Qt5.10+ frontend implementation for rpcs3. Known to work on Windows, Linux, Mac +// Qt5.10+ frontend implementation for rpcs3. Known to work on Windows, Linux, Mac // by Sacha Refshauge, Megamouse and flash-fire #include @@ -97,13 +97,14 @@ static semaphore<> s_qt_mutex{}; std::abort(); } -const char* ARG_NO_GUI = "no-gui"; +const char* ARG_HEADLESS = "headless"; const char* ARG_HI_DPI = "hidpi"; QCoreApplication* createApplication(int& argc, char* argv[]) { + const std::string headless("--" + std::string(ARG_HEADLESS)); for (int i = 1; i < argc; ++i) - if (!strcmp(ARG_NO_GUI, argv[i])) + if (!strcmp(headless.c_str(), argv[i])) return new headless_application(argc, argv); return new gui_application(argc, argv); } @@ -126,6 +127,8 @@ int main(int argc, char** argv) s_qt_mutex.lock(); QScopedPointer app(createApplication(argc, argv)); + app->setApplicationVersion(qstr(rpcs3::version.to_string())); + app->setApplicationName("RPCS3"); // Command line args QCommandLineParser parser; @@ -135,7 +138,7 @@ int main(int argc, char** argv) const QCommandLineOption helpOption = parser.addHelpOption(); const QCommandLineOption versionOption = parser.addVersionOption(); - parser.addOption(QCommandLineOption(ARG_NO_GUI, "Run RPCS3 without the GUI.")); + parser.addOption(QCommandLineOption(ARG_HEADLESS, "Run RPCS3 in headless mode.")); parser.addOption(QCommandLineOption(ARG_HI_DPI, "Enables Qt High Dpi Scaling.", "enabled", "1")); parser.process(app->arguments()); @@ -143,9 +146,6 @@ int main(int argc, char** argv) if (parser.isSet(versionOption) || parser.isSet(helpOption)) return 0; - app->setApplicationVersion(qstr(rpcs3::version.to_string())); - app->setApplicationName("RPCS3"); - if (auto gui_app = qobject_cast(app.data())) { // Set QT_AUTO_SCREEN_SCALE_FACTOR from environment. Defaults to cli argument, which defaults to 1. @@ -158,9 +158,9 @@ int main(int argc, char** argv) gui_app->Init(); } - else if (auto non_gui_app = qobject_cast(app.data())) + else if (auto headless_app = qobject_cast(app.data())) { - non_gui_app->Init(); + headless_app->Init(); } #ifdef _WIN32