Bug fix: XOutputDevice.RefreshInput() is not thread safe.

kenh6942 · kenh6942 · commit a5e9894c40f0 · 2024-01-14T13:08:35.000-05:00
diff --git a/XOutput/Devices/XInput/XOutputDevice.cs b/XOutput/Devices/XInput/XOutputDevice.cs
@@ -43,7 +43,6 @@ public sealed class XOutputDevice : IDevice
         private readonly InputMapper mapper;
         private readonly DPadDirection[] dPads = new DPadDirection[DPadCount];
         private readonly XOutputSource[] sources;
-        private readonly DeviceState state;
         private DeviceInputChangedEventArgs deviceInputChangedEventArgs;
 
         /// <summary>
@@ -55,7 +54,6 @@ public XOutputDevice(InputMapper mapper)
         {
             this.mapper = mapper;
             sources = XInputHelper.Instance.GenerateSources();
-            state = new DeviceState(sources, DPadCount);
             deviceInputChangedEventArgs = new DeviceInputChangedEventArgs(this);
         }
 
@@ -108,7 +106,7 @@ private void SourceInputChanged(object sender, DeviceInputChangedEventArgs e)
         /// <returns>if the input was available</returns>
         public bool RefreshInput(bool force = false)
         {
-            state.ResetChanges();
+            DeviceState state = new DeviceState(sources, DPadCount);
             foreach (var s in sources)
             {
                 if (s.Refresh(mapper))

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public sealed class XOutputDevice : IDevice`
`43`	`43`	`private readonly InputMapper mapper;`
`44`	`44`	`private readonly DPadDirection[] dPads = new DPadDirection[DPadCount];`
`45`	`45`	`private readonly XOutputSource[] sources;`
`46`		`- private readonly DeviceState state;`
`47`	`46`	`private DeviceInputChangedEventArgs deviceInputChangedEventArgs;`
`48`	`47`
`49`	`48`	`/// <summary>`
`@@ -55,7 +54,6 @@ public XOutputDevice(InputMapper mapper)`
`55`	`54`	`{`
`56`	`55`	`this.mapper = mapper;`
`57`	`56`	`sources = XInputHelper.Instance.GenerateSources();`
`58`		`- state = new DeviceState(sources, DPadCount);`
`59`	`57`	`deviceInputChangedEventArgs = new DeviceInputChangedEventArgs(this);`
`60`	`58`	`}`
`61`	`59`
`@@ -108,7 +106,7 @@ private void SourceInputChanged(object sender, DeviceInputChangedEventArgs e)`
`108`	`106`	`/// <returns>if the input was available</returns>`
`109`	`107`	`public bool RefreshInput(bool force = false)`
`110`	`108`	`{`
`111`		`- state.ResetChanges();`
	`109`	`+ DeviceState state = new DeviceState(sources, DPadCount);`
`112`	`110`	`foreach (var s in sources)`
`113`	`111`	`{`
`114`	`112`	`if (s.Refresh(mapper))`