From 14f22ad829f7beac65756e5fea75a8e02a0ba20f Mon Sep 17 00:00:00 2001 From: Michael M Date: Fri, 3 Nov 2017 13:28:45 -0700 Subject: Qt Mapping*: make logic around setting/loading settings more consistent Changes: - signal for widget value changed: sets controller setting, saves settings - Update(): only updates widget from existing controller setting - Clear(): sets controller setting, saves settings, and calls Update() --- Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index d30be53ec5..dd3254ac26 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -83,9 +83,8 @@ void MappingButton::OnButtonTimeout() void MappingButton::Clear() { - m_parent->Update(); m_reference->SetExpression(""); - Update(); + m_parent->SaveSettings(); } void MappingButton::Update() @@ -93,7 +92,6 @@ void MappingButton::Update() const auto lock = ControllerEmu::EmulatedController::GetStateLock(); m_reference->UpdateReference(g_controller_interface, m_parent->GetParent()->GetDeviceQualifier()); setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); - m_parent->SaveSettings(); } void MappingButton::mouseReleaseEvent(QMouseEvent* event) -- cgit v1.2.3