Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-05-09 12:24:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14632 from vladfi1/upstream-pipe-inputs-fix

Browse Source 
Unconditionally lock in ControllerInterface::UpdateInput
This commit is contained in:
Dentomologist 2026-05-06 13:40:16 -07:00 committed by GitHub
commit cf20cdabd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -319,7 +319,7 @@ void ControllerInterface::RemoveDevice(std::function<bool(const ciface::Core::De
InvokeDevicesChangedCallbacks();
}
// Update input for all devices if lock can be acquired without waiting.
// Update input for all devices.
void ControllerInterface::UpdateInput()
{
// This should never happen
@ -337,13 +337,7 @@ void ControllerInterface::UpdateInput()
std::vector<std::weak_ptr<ciface::Core::Device>> devices_to_remove;
{
// TODO: if we are an emulation input channel, we should probably always lock.
// Prefer outdated values over blocking UI or CPU thread (this avoids short but noticeable frame
// drops)
if (!m_devices_mutex.try_lock())
return;
std::lock_guard lk_devices(m_devices_mutex, std::adopt_lock);
std::lock_guard lk_devices(m_devices_mutex);
tls_is_updating_devices = true;