github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-06 19:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

InputManager: Fix crash on controller connect on Windows

Browse Source
This commit is contained in:
Stenzek 2025-01-11 23:29:55 +10:00
parent 6785285f31
commit 36590f3c71
No known key found for this signature in database
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/input_manager.cpp
View File

@ -146,10 +146,9 @@ using BindingMap = std::unordered_multimap<InputBindingKey, std::shared_ptr<Inpu
using VibrationBindingArray = std::vector<PadVibrationBinding>; using VibrationBindingArray = std::vector<PadVibrationBinding>;
static BindingMap s_binding_map; static BindingMap s_binding_map;
static VibrationBindingArray s_pad_vibration_array; static VibrationBindingArray s_pad_vibration_array;
static std::mutex s_mutex; static std::recursive_mutex s_mutex;
// Hooks/intercepting (for setting bindings) // Hooks/intercepting (for setting bindings)
static std::mutex m_event_intercept_mutex;
static InputInterceptHook::Callback m_event_intercept_callback; static InputInterceptHook::Callback m_event_intercept_callback;
// Input sources. Keyboard/mouse don't exist here. // Input sources. Keyboard/mouse don't exist here.
@ -1864,27 +1863,27 @@ void InputManager::UpdateMacroButtons()
void InputManager::SetHook(InputInterceptHook::Callback callback) void InputManager::SetHook(InputInterceptHook::Callback callback)
{ {
std::unique_lock<std::mutex> lock(m_event_intercept_mutex); std::unique_lock lock(s_mutex);
DebugAssert(!m_event_intercept_callback); DebugAssert(!m_event_intercept_callback);
m_event_intercept_callback = std::move(callback); m_event_intercept_callback = std::move(callback);
} }
void InputManager::RemoveHook() void InputManager::RemoveHook()
{ {
std::unique_lock<std::mutex> lock(m_event_intercept_mutex); std::unique_lock lock(s_mutex);
if (m_event_intercept_callback) if (m_event_intercept_callback)
m_event_intercept_callback = {}; m_event_intercept_callback = {};
} }
bool InputManager::HasHook() bool InputManager::HasHook()
{ {
std::unique_lock<std::mutex> lock(m_event_intercept_mutex); std::unique_lock lock(s_mutex);
return (bool)m_event_intercept_callback; return (bool)m_event_intercept_callback;
} }
bool InputManager::DoEventHook(InputBindingKey key, float value) bool InputManager::DoEventHook(InputBindingKey key, float value)
{ {
std::unique_lock<std::mutex> lock(m_event_intercept_mutex); std::unique_lock lock(s_mutex);
if (!m_event_intercept_callback) if (!m_event_intercept_callback)
return false; return false;