summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2022-12-30 00:14:53 -0800
committerGravatar bunnei2022-12-30 00:14:53 -0800
commit05c709bebe2f01f7f66d04cab1386f12d1e5b4dd (patch)
tree2572337125fdffa34674478b763f28c53a71febf
parentMerge pull request #9515 from liamwhite/cmake-refactor (diff)
downloadyuzu-05c709bebe2f01f7f66d04cab1386f12d1e5b4dd.tar.gz
yuzu-05c709bebe2f01f7f66d04cab1386f12d1e5b4dd.tar.xz
yuzu-05c709bebe2f01f7f66d04cab1386f12d1e5b4dd.zip
core: hid: emulated_console: Avoid a crash if frontend does not configure touch_from_button_maps.
-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() {
40 touch_params[index++] = std::move(touchscreen_param); 40 touch_params[index++] = std::move(touchscreen_param);
41 } 41 }
42 42
43 if (Settings::values.touch_from_button_maps.empty()) {
44 LOG_WARNING(Input, "touch_from_button_maps is unset by frontend config");
45 return;
46 }
47
43 const auto button_index = 48 const auto button_index =
44 static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue()); 49 static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue());
45 const auto& touch_buttons = Settings::values.touch_from_button_maps[button_index].buttons; 50 const auto& touch_buttons = Settings::values.touch_from_button_maps[button_index].buttons;