From 206314445b2639ae8e85b6d76e4b6c40e07c6dc3 Mon Sep 17 00:00:00 2001 From: Alan Unger Date: Sun, 6 Jun 2021 17:44:44 -0400 Subject: [PATCH] Skip DirectInput initialization for device names containing "Xbox One" or "XINPUT" --- src/BizHawk.Bizware.DirectX/GamePad.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Bizware.DirectX/GamePad.cs b/src/BizHawk.Bizware.DirectX/GamePad.cs index ab1e081835..18824c7f44 100644 --- a/src/BizHawk.Bizware.DirectX/GamePad.cs +++ b/src/BizHawk.Bizware.DirectX/GamePad.cs @@ -26,7 +26,7 @@ namespace BizHawk.Bizware.DirectX { Console.WriteLine("joy device: {0} `{1}`", device.InstanceGuid, device.ProductName); - if (device.ProductName.Contains("XBOX 360")) + if (device.ProductName.Contains("XBOX 360") || device.ProductName.Contains("Xbox One") || device.ProductName.Contains("XINPUT")) continue; // Don't input XBOX 360 controllers into here; we'll process them via XInput (there are limitations in some trigger axes when xbox pads go over xinput) var joystick = new Joystick(_directInput, device.InstanceGuid);