From 151908104e129357e81eeebde927d71e57067af9 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sat, 28 Oct 2023 22:49:28 -0700
Subject: [PATCH] Revert 683aa263a0ccdc8a4747fbb4ef359842b52c9a26

---
 .../Base Implementations/ControllerDefinition.cs               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs b/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
index c69a735fe8..5b95fb9a79 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs	
+++ b/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs	
@@ -52,7 +52,8 @@ namespace BizHawk.Emulation.Common
 			foreach (var kvp in copyFrom.Axes) Axes.Add(kvp);
 			HapticsChannels.AddRange(copyFrom.HapticsChannels);
 			CategoryLabels = copyFrom.CategoryLabels;
-			_orderedControls = copyFrom._orderedControls;
+			// Do not clone _orderedControls, as GenOrderedControls may be overridden by the derived class
+			// _orderedControls = copyFrom._orderedControls;
 			MakeImmutable();
 		}