From 0dbb58112a2e85d558f7c455c5140e073c5d49df Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Mon, 28 Oct 2019 10:30:34 +0100
Subject: [PATCH] CommandLineParse: Don't ignore video_backend/audio_emulation
 when not using -C

---
 Source/Core/UICommon/CommandLineParse.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/UICommon/CommandLineParse.cpp b/Source/Core/UICommon/CommandLineParse.cpp
index 5a12d62997..0794546db5 100644
--- a/Source/Core/UICommon/CommandLineParse.cpp
+++ b/Source/Core/UICommon/CommandLineParse.cpp
@@ -114,13 +114,13 @@ std::unique_ptr<optparse::OptionParser> CreateParser(ParserOptions options)
 
 static void AddConfigLayer(const optparse::Values& options)
 {
+  std::list<std::string> config_args;
   if (options.is_set_by_user("config"))
-  {
-    const std::list<std::string>& config_args = options.all("config");
-    Config::AddLayer(std::make_unique<CommandLineConfigLayerLoader>(
-        config_args, static_cast<const char*>(options.get("video_backend")),
-        static_cast<const char*>(options.get("audio_emulation"))));
-  }
+    config_args = options.all("config");
+
+  Config::AddLayer(std::make_unique<CommandLineConfigLayerLoader>(
+      std::move(config_args), static_cast<const char*>(options.get("video_backend")),
+      static_cast<const char*>(options.get("audio_emulation"))));
 }
 
 optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv)