From bed06f46d726d360f0b624ba52b4465d79394fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 11 Jul 2023 11:00:57 +0200 Subject: [PATCH] Bugfix: Also check the allow-combo setting for analog inputs. --- UI/ControlMappingScreen.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 3b0bd26cdd..5841b6d56d 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -446,14 +446,18 @@ void KeyMappingNewKeyDialog::axis(const AxisInput &axis) { if (axis.value > AXIS_BIND_THRESHOLD) { InputMapping mapping(axis.deviceId, axis.axisId, 1); triggeredAxes_.insert(mapping); - if (!mapping_.mappings.contains(mapping)) { + if (!g_Config.bAllowMappingCombos && !mapping_.mappings.empty()) { + comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE); + } else if (!mapping_.mappings.contains(mapping)) { mapping_.mappings.push_back(mapping); RecreateViews(); } } else if (axis.value < -AXIS_BIND_THRESHOLD) { InputMapping mapping(axis.deviceId, axis.axisId, -1); triggeredAxes_.insert(mapping); - if (!mapping_.mappings.contains(mapping)) { + if (!g_Config.bAllowMappingCombos && !mapping_.mappings.empty()) { + comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE); + } else if (!mapping_.mappings.contains(mapping)) { mapping_.mappings.push_back(mapping); RecreateViews(); }