summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
diff options
context:
space:
mode:
authorMichael M <mchtly@gmail.com>2017-11-03 13:28:45 -0700
committerMichael M <mchtly@gmail.com>2017-11-05 11:32:23 -0800
commit14f22ad829f7beac65756e5fea75a8e02a0ba20f (patch)
tree084a344a0feebc4b9e8353fc5e193a2008c58f34 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
parentbb38b399528e3932acf1e796e26ba2eb723d1f8c (diff)
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()
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp4
1 files changed, 1 insertions, 3 deletions
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)