summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-12-30 09:26:41 +0100
committerGitHub <noreply@github.com>2022-12-30 09:26:41 +0100
commit0ac34bd058ad055c5700ad01806b517991e1b87c (patch)
tree2572337125fdffa34674478b763f28c53a71febf
parentMerge pull request #9515 from liamwhite/cmake-refactor (diff)
parentcore: hid: emulated_console: Avoid a crash if frontend does not configure touch_from_button_maps. (diff)
downloadyuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.gz
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.bz2
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.lz
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.xz
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.tar.zst
yuzu-0ac34bd058ad055c5700ad01806b517991e1b87c.zip
-rw-r--r--src/core/hid/emulated_console.cpp5
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;