diff --git a/app/main.cpp b/app/main.cpp index 4cb325d5..e5bf7ecf 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -162,6 +162,9 @@ void qtLogToDiskHandler(QtMsgType type, const QMessageLogContext&, const QString typeTxt = "Info"; break; case QtWarningMsg: + if (s_SuppressVerboseOutput) { + return; + } typeTxt = "Warning"; break; case QtCriticalMsg: @@ -405,18 +408,6 @@ int main(int argc, char *argv[]) // Register custom metatypes for use in signals qRegisterMetaType("NvApp"); - SDL_version compileVersion; - SDL_VERSION(&compileVersion); - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Compiled with SDL %d.%d.%d", - compileVersion.major, compileVersion.minor, compileVersion.patch); - - SDL_version runtimeVersion; - SDL_GetVersion(&runtimeVersion); - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Running with SDL %d.%d.%d", - runtimeVersion.major, runtimeVersion.minor, runtimeVersion.patch); - // Allow the display to sleep by default. We will manually use SDL_DisableScreenSaver() // and SDL_EnableScreenSaver() when appropriate. This hint must be set before // initializing the SDL video subsystem to have any effect. @@ -494,6 +485,31 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); + GlobalCommandLineParser parser; + GlobalCommandLineParser::ParseResult commandLineParserResult = parser.parse(app.arguments()); + switch (commandLineParserResult) { + case GlobalCommandLineParser::ListRequested: +#ifdef USE_CUSTOM_LOGGER + // Don't log to the console since it will jumble the command output + s_SuppressVerboseOutput = true; +#endif + break; + default: + break; + } + + SDL_version compileVersion; + SDL_VERSION(&compileVersion); + SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, + "Compiled with SDL %d.%d.%d", + compileVersion.major, compileVersion.minor, compileVersion.patch); + + SDL_version runtimeVersion; + SDL_GetVersion(&runtimeVersion); + SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, + "Running with SDL %d.%d.%d", + runtimeVersion.major, runtimeVersion.minor, runtimeVersion.patch); + // Apply the initial translation based on user preference StreamingPreferences prefs; prefs.retranslate(); @@ -609,8 +625,7 @@ int main(int argc, char *argv[]) QString initialView; bool hasGUI = true; - GlobalCommandLineParser parser; - switch (parser.parse(app.arguments())) { + switch (commandLineParserResult) { case GlobalCommandLineParser::NormalStartRequested: initialView = "qrc:/gui/PcView.qml"; break; @@ -651,12 +666,6 @@ int main(int argc, char *argv[]) auto launcher = new CliListApps::Launcher(listParser.getHost(), listParser, &app); launcher->execute(new ComputerManager(&app)); hasGUI = false; - -#ifdef USE_CUSTOM_LOGGER - // Don't log to the console since it will jumble the command output - s_SuppressVerboseOutput = true; -#endif - break; } }