diff options
| author | bunnei <[email protected]> | 2022-12-30 03:26:41 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-30 03:26:41 -0500 |
| commit | 0ac34bd058ad055c5700ad01806b517991e1b87c (patch) | |
| tree | 2572337125fdffa34674478b763f28c53a71febf | |
| parent | c3af6d83724ef4640d2544f09220309cd93c701b (diff) | |
| parent | 05c709bebe2f01f7f66d04cab1386f12d1e5b4dd (diff) | |
| download | yuzu-android-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.gz yuzu-android-0ac34bd058ad055c5700ad01806b517991e1b87c.zip | |
Merge pull request #9524 from bunnei/touch-button-crash-fix
core: hid: emulated_console: Avoid a crash if frontend does not configure touch_from_button_maps.
| -rw-r--r-- | src/core/hid/emulated_console.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hid/emulated_console.cpp b/src/core/hid/emulated_console.cpp index 30c2e9d17..1c91bbe40 100644 --- a/src/core/hid/emulated_console.cpp +++ b/src/core/hid/emulated_console.cpp @@ -40,6 +40,11 @@ void EmulatedConsole::SetTouchParams() { touch_params[index++] = std::move(touchscreen_param); } + if (Settings::values.touch_from_button_maps.empty()) { + LOG_WARNING(Input, "touch_from_button_maps is unset by frontend config"); + return; + } + const auto button_index = static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue()); const auto& touch_buttons = Settings::values.touch_from_button_maps[button_index].buttons; |