diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-08-26 16:34:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 16:34:46 +0200 |
| commit | 2502e412b3ca333a866b36c14c232bb1f33af068 (patch) | |
| tree | e2c2cb420b64ac6388799d017a7992ee553b0081 /Source/Core/InputCommon/GCAdapter.cpp | |
| parent | d8e35438bd1314d650c88e367782120b55f12327 (diff) | |
| parent | b62c25864f6d549976b94eda60763524413e896e (diff) | |
Merge pull request #12117 from JosJuice/config-callback-cpu
Don't call RunAsCPUThread in config callbacks
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 6334a23778..2d135970d1 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -23,6 +23,7 @@ #endif #include "Common/BitUtils.h" +#include "Common/Config/Config.h" #include "Common/Event.h" #include "Common/Flag.h" #include "Common/Logging/Log.h" @@ -158,7 +159,7 @@ static u8 s_endpoint_out = 0; static u64 s_last_init = 0; -static std::optional<size_t> s_config_callback_id = std::nullopt; +static std::optional<Config::ConfigChangedCallbackID> s_config_callback_id = std::nullopt; static bool s_is_adapter_wanted = false; static std::array<bool, SerialInterface::MAX_SI_CHANNELS> s_config_rumble_enabled{}; |