Merge pull request #8683 from AlexApps99/cmdl

Parse arguments before Qt
dolphin-emu · Mar 24, 2020 · b3ad3c3 · b3ad3c3
2 parents 323bffe + d6fb0b4
commit b3ad3c3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp
@@ -92,6 +92,10 @@ int main(int argc, char* argv[])
   }
 #endif
 
+  auto parser = CommandLineParse::CreateParser(CommandLineParse::ParserOptions::IncludeGUIOptions);
+  const optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv);
+  const std::vector<std::string> args = parser->args();
+
   QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
   QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
   QCoreApplication::setOrganizationName(QStringLiteral("Dolphin Emulator"));
@@ -109,10 +113,6 @@ int main(int argc, char* argv[])
   QApplication::setFont(QApplication::font("QMenu"));
 #endif
 
-  auto parser = CommandLineParse::CreateParser(CommandLineParse::ParserOptions::IncludeGUIOptions);
-  const optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv);
-  const std::vector<std::string> args = parser->args();
-
 #ifdef _WIN32
   FreeConsole();
 #endif