diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-11-11 12:11:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 12:11:26 +0100 |
| commit | 41c2618b1067dfac0c65fe3afeb4cf11dd8323db (patch) | |
| tree | 5172db2327c6bd29f413a963aaf87b4786cd8951 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | |
| parent | e5d1e2a914e038c94c1898125b24b893c12f5c22 (diff) | |
| parent | 14f22ad829f7beac65756e5fea75a8e02a0ba20f (diff) | |
Merge pull request #6175 from ligfx/qtinputupdateclear
Qt Mapping*: make logic around setting/loading settings more consistent
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 4 |
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) |