From b425f86121c8c9f3b4a510e522d03e432677dcea Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2019 09:02:38 -0600 Subject: ControllerInterface: Allow hotplug callbacks to be unregistered and don't reload the entire config from the ini file on hotplug, just update the control references. This should fix a crash on shutdown on Android. --- .../InputCommon/ControllerInterface/ControllerInterface.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 318b288434..3da92e8b75 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -249,10 +249,20 @@ void ControllerInterface::UpdateInput() // Register a callback to be called when a device is added or removed (as from the input backends' // hotplug thread), or when devices are refreshed -void ControllerInterface::RegisterDevicesChangedCallback(std::function callback) +// Returns a handle for later removing the callback. +ControllerInterface::HotplugCallbackHandle +ControllerInterface::RegisterDevicesChangedCallback(std::function callback) { std::lock_guard lk(m_callbacks_mutex); m_devices_changed_callbacks.emplace_back(std::move(callback)); + return std::prev(m_devices_changed_callbacks.end()); +} + +// Unregister a device callback. +void ControllerInterface::UnregisterDevicesChangedCallback(const HotplugCallbackHandle& handle) +{ + std::lock_guard lk(m_callbacks_mutex); + m_devices_changed_callbacks.erase(handle); } // Invoke all callbacks that were registered -- cgit v1.2.3