diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 9dd8cdb6a9..20fd517b2d 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -319,7 +319,7 @@ void ControllerInterface::RemoveDevice(std::function> 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;