From 359ed5348a712fc6eb19600c1482e11b7a754ccd Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 6 Mar 2021 20:00:07 +0100
Subject: [PATCH] Config: Give Movie and Netplay higher priority than
 CommandLine

Avoiding desyncs is more important than honoring what the user
specified on the command line.
---
 Source/Core/Common/Config/Enums.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h
index 5c75a01893..1999005401 100644
--- a/Source/Core/Common/Config/Enums.h
+++ b/Source/Core/Common/Config/Enums.h
@@ -8,14 +8,15 @@
 
 namespace Config
 {
+// Layers in ascending order of priority.
 enum class LayerType
 {
   Base,
+  CommandLine,
   GlobalGame,
   LocalGame,
   Movie,
   Netplay,
-  CommandLine,
   CurrentRun,
   Meta,
 };
@@ -36,11 +37,11 @@ enum class System
 
 constexpr std::array<LayerType, 7> SEARCH_ORDER{{
     LayerType::CurrentRun,
-    LayerType::CommandLine,
-    LayerType::Movie,
     LayerType::Netplay,
+    LayerType::Movie,
     LayerType::LocalGame,
     LayerType::GlobalGame,
+    LayerType::CommandLine,
     LayerType::Base,
 }};
 }  // namespace Config