The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 07:45:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11040 from AdmiralCurtiss/update-references-deadlock

Browse Source 
InputCommon: Fix deadlock in EmulatedController::UpdateReferences().
This commit is contained in:
Mai 2022-09-07 23:39:10 -04:00 committed by GitHub
commit 348db11bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
View File

@ -40,7 +40,7 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
void EmulatedController::UpdateReferences(const ControllerInterface& devi) void EmulatedController::UpdateReferences(const ControllerInterface& devi)
{ {
const auto lock = GetStateLock(); std::scoped_lock lk(s_get_state_mutex, devi.GetDevicesMutex());
m_default_device_is_connected = devi.HasConnectedDevice(m_default_device); m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);

2
Source/Core/InputCommon/ControllerInterface/CoreDevice.h
View File

@ -238,6 +238,8 @@ public:
std::chrono::milliseconds confirmation_wait, std::chrono::milliseconds confirmation_wait,
std::chrono::milliseconds maximum_wait) const; std::chrono::milliseconds maximum_wait) const;
std::recursive_mutex& GetDevicesMutex() const { return m_devices_mutex; }
protected: protected:
// Exclusively needed when reading/writing "m_devices" // Exclusively needed when reading/writing "m_devices"
mutable std::recursive_mutex m_devices_mutex; mutable std::recursive_mutex m_devices_mutex;