From 002fa91c19bc9a740bf6daebb06f9b279bbf1ebd Mon Sep 17 00:00:00 2001
From: Babib3l <gab.chevanne@gmail.com>
Date: Tue, 2 Jun 2026 15:16:19 +0200
Subject: [PATCH] Enable dynamic input swap for controller assignment checks

---
 src/Ryujinx.Input/HLE/NpadController.cs | 3 ++-
 src/Ryujinx.Input/HLE/NpadManager.cs    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx.Input/HLE/NpadController.cs b/src/Ryujinx.Input/HLE/NpadController.cs
index 75742bc5f..bab9d815b 100644
--- a/src/Ryujinx.Input/HLE/NpadController.cs
+++ b/src/Ryujinx.Input/HLE/NpadController.cs
@@ -757,7 +757,7 @@ namespace Ryujinx.Input.HLE
                 .Where(device => device.Type == AssignedInputDeviceType.Controller)
                 .ToList() ?? [];
 
-            if (assignedControllers.Count > 0)
+            if (_playerInputAssignment?.EnableDynamicInputSwap == true)
             {
                 foreach (AssignedInputDevice assignedController in assignedControllers)
                 {
@@ -770,6 +770,7 @@ namespace Ryujinx.Input.HLE
                         }
                     }
                 }
+
                 yield break;
             }
 
diff --git a/src/Ryujinx.Input/HLE/NpadManager.cs b/src/Ryujinx.Input/HLE/NpadManager.cs
index b5966baf5..2a992074a 100644
--- a/src/Ryujinx.Input/HLE/NpadManager.cs
+++ b/src/Ryujinx.Input/HLE/NpadManager.cs
@@ -211,7 +211,7 @@ namespace Ryujinx.Input.HLE
                     playerInputAssignment,
                     PlayerInputAssignmentHelper.CreatePrimaryDevice(inputConfig));
 
-                if (normalizedAssignment.Devices.Count > 0)
+                if (normalizedAssignment.EnableDynamicInputSwap || normalizedAssignment.Devices.Count > 0)
                 {
                     return normalizedAssignment;
                 }