diff options
| author | 2018-11-22 12:23:43 -0500 | |
|---|---|---|
| committer | 2018-11-22 12:23:43 -0500 | |
| commit | b358e8851273efe5745daae605755b7f7a52bdc3 (patch) | |
| tree | e1f914eebd8a94b4f59f33687e00f18eb254aad4 | |
| parent | Merge pull request #1775 from bunnei/blend-eq (diff) | |
| download | yuzu-b358e8851273efe5745daae605755b7f7a52bdc3.tar.gz yuzu-b358e8851273efe5745daae605755b7f7a52bdc3.tar.xz yuzu-b358e8851273efe5745daae605755b7f7a52bdc3.zip | |
debug_pad: Avoid loading input for nonexistent buttons (Home and Screenshot)
Prevents memory exceptions when the debug pad is enabled.
| -rw-r--r-- | src/core/hle/service/hid/controllers/debug_pad.cpp | 5 |
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) { | |||
| 71 | 71 | ||
| 72 | void Controller_DebugPad::OnLoadInputDevices() { | 72 | void Controller_DebugPad::OnLoadInputDevices() { |
| 73 | std::transform(Settings::values.debug_pad_buttons.begin(), | 73 | std::transform(Settings::values.debug_pad_buttons.begin(), |
| 74 | Settings::values.debug_pad_buttons.end(), buttons.begin(), | 74 | Settings::values.debug_pad_buttons.begin() + |
| 75 | Input::CreateDevice<Input::ButtonDevice>); | 75 | Settings::NativeButton::NUM_BUTTONS_HID, |
| 76 | buttons.begin(), Input::CreateDevice<Input::ButtonDevice>); | ||
| 76 | std::transform(Settings::values.debug_pad_analogs.begin(), | 77 | std::transform(Settings::values.debug_pad_analogs.begin(), |
| 77 | Settings::values.debug_pad_analogs.end(), analogs.begin(), | 78 | Settings::values.debug_pad_analogs.end(), analogs.begin(), |
| 78 | Input::CreateDevice<Input::AnalogDevice>); | 79 | Input::CreateDevice<Input::AnalogDevice>); |