The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Jordan Woyak
2019-01-10 09:02:38 -06:00
parent c2afcb0f6b
commit b425f86121
10 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View File

@ -6,9 +6,9 @@
#include <atomic>
#include <functional>
#include <list>
#include <memory>
#include <mutex>
#include <vector>
#include "Common/WindowSystemInfo.h"
#include "InputCommon/ControllerInterface/Device.h"
@ -40,6 +40,8 @@
class ControllerInterface : public ciface::Core::DeviceContainer
{
public:
using HotplugCallbackHandle = std::list<std::function<void()>>::iterator;
ControllerInterface() : m_is_init(false) {}
void Initialize(const WindowSystemInfo& wsi);
void ChangeWindow(void* hwnd);
@ -50,11 +52,12 @@ public:
bool IsInit() const { return m_is_init; }
void UpdateInput();
void RegisterDevicesChangedCallback(std::function<void(void)> callback);
HotplugCallbackHandle RegisterDevicesChangedCallback(std::function<void(void)> callback);
void UnregisterDevicesChangedCallback(const HotplugCallbackHandle& handle);
void InvokeDevicesChangedCallbacks() const;
private:
std::vector<std::function<void()>> m_devices_changed_callbacks;
std::list<std::function<void()>> m_devices_changed_callbacks;
mutable std::mutex m_callbacks_mutex;
std::atomic<bool> m_is_init;
std::atomic<bool> m_is_populating_devices{false};