ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 10:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win] Do not change device index when replugging

Browse source
This commit is contained in:
thefiddler 2014-07-31 23:03:24 +02:00
parent 9efa75179f
commit 354fc04614
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Source/OpenTK/Platform/Windows/WinRawJoystick.cs
View file

@ -224,9 +224,15 @@ namespace OpenTK.Platform.Windows
if (dev.Type != RawInputDeviceType.HID) if (dev.Type != RawInputDeviceType.HID)
continue; continue;
// We use the device handle as the hardware id.
// This works, but the handle will change whenever the
// device is unplugged/replugged. We compensate for this
// by checking device GUIDs, below.
// Note: we cannot use the GUID as the hardware id,
// because it is costly to query (and we need to query
// that every time we process a device event.)
IntPtr handle = dev.Device; IntPtr handle = dev.Device;
Guid guid = GetDeviceGuid(handle); Guid guid = GetDeviceGuid(handle);
//long hardware_id = guid.GetHashCode();
long hardware_id = handle.ToInt64(); long hardware_id = handle.ToInt64();
Device device = Devices.FromHardwareId(hardware_id); Device device = Devices.FromHardwareId(hardware_id);
@ -244,6 +250,22 @@ namespace OpenTK.Platform.Windows
QueryDeviceCaps(device); QueryDeviceCaps(device);
device.SetConnected(true); device.SetConnected(true);
// Check if a disconnected device with identical GUID already exists.
// If so, replace that device with this instance.
Device match = null;
foreach (Device candidate in Devices)
{
if (candidate.GetGuid() == guid && !candidate.GetCapabilities().IsConnected)
{
match = candidate;
}
}
if (match != null)
{
Devices.Remove(match.Handle.ToInt64());
}
Devices.Add(hardware_id, device); Devices.Add(hardware_id, device);
Debug.Print("[{0}] Connected joystick {1} ({2})", Debug.Print("[{0}] Connected joystick {1} ({2})",