diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-12-29 20:17:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 20:17:04 +0100 |
| commit | 99fbc4b97ecc21c82a8cde602af1bf3b47a186d2 (patch) | |
| tree | c42b16871bed955e337895a8d3c42ee17cf164c8 /Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | |
| parent | bf0ac9de0ccf004b86ccadd0a0212fc6804d7600 (diff) | |
| parent | e456bef163c1b667ff5a045a4bda66b30326ae90 (diff) | |
Merge pull request #11885 from Filoppi/devices_deadlock_fix_v2
Input: Improve Controller Interface devices threading
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index eb60721b2f..f095818287 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -222,7 +222,7 @@ bool Joystick::IsValid() const return SUCCEEDED(m_device->Acquire()); } -void Joystick::UpdateInput() +Core::DeviceRemoval Joystick::UpdateInput() { HRESULT hr = 0; @@ -261,6 +261,8 @@ void Joystick::UpdateInput() // try reacquire if input lost if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr) m_device->Acquire(); + + return Core::DeviceRemoval::Keep; } // get name |