From e8a21d32dc028c03a93498a568db78c06e71d5c9 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 25 May 2021 14:14:36 +1000 Subject: [PATCH] CommonHostInterface: Use string list for autofire bindings Fixes autofire bindings on Android. --- src/frontend-common/common_host_interface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index ed5e89b26..a15186785 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -1620,12 +1620,12 @@ void CommonHostInterface::UpdateControllerInputMap(SettingsInterface& si) if (button_name.empty()) continue; - const std::string binding( - si.GetStringValue(category, TinyString::FromFormat("AutoFire%u", turbo_button_index + 1), "")); + const std::vector bindings = + si.GetStringList(category, TinyString::FromFormat("AutoFire%u", turbo_button_index + 1)); #ifndef __ANDROID__ // Android doesn't require a binding, since we can trigger it from the touchscreen controller. - if (binding.empty()) + if (bindings.empty()) continue; #endif @@ -1648,7 +1648,7 @@ void CommonHostInterface::UpdateControllerInputMap(SettingsInterface& si) ts.active = false; ts.state = false; - if (!binding.empty()) + for (const std::string& binding : bindings) { std::string_view device, button; if (!SplitBinding(binding, &device, &button) ||