summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2018-11-22 19:41:32 +0100
committerGitHub <noreply@github.com>2018-11-22 19:41:32 +0100
commitbee5a7acb1ba2d7312fa11dd663a355733c0858d (patch)
treee1f914eebd8a94b4f59f33687e00f18eb254aad4
parentMerge pull request #1775 from bunnei/blend-eq (diff)
parentdebug_pad: Avoid loading input for nonexistent buttons (Home and Screenshot) (diff)
downloadyuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar.gz
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar.bz2
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar.lz
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar.xz
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.tar.zst
yuzu-bee5a7acb1ba2d7312fa11dd663a355733c0858d.zip
-rw-r--r--src/core/hle/service/hid/controllers/debug_pad.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/core/hle/service/hid/controllers/debug_pad.cpp
index e76c83aee..c22357d8c 100644
--- a/src/core/hle/service/hid/controllers/debug_pad.cpp
+++ b/src/core/hle/service/hid/controllers/debug_pad.cpp
@@ -71,8 +71,9 @@ void Controller_DebugPad::OnUpdate(u8* data, std::size_t size) {
void Controller_DebugPad::OnLoadInputDevices() {
std::transform(Settings::values.debug_pad_buttons.begin(),
- Settings::values.debug_pad_buttons.end(), buttons.begin(),
- Input::CreateDevice<Input::ButtonDevice>);
+ Settings::values.debug_pad_buttons.begin() +
+ Settings::NativeButton::NUM_BUTTONS_HID,
+ buttons.begin(), Input::CreateDevice<Input::ButtonDevice>);
std::transform(Settings::values.debug_pad_analogs.begin(),
Settings::values.debug_pad_analogs.end(), analogs.begin(),
Input::CreateDevice<Input::AnalogDevice>);