diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2020-02-25 22:57:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 22:57:00 +0100 |
| commit | 459b47295dd0af91c24d921b4c8f1e17958e8c68 (patch) | |
| tree | b9bea54599dc20a0f36e087f00294a8ee2fe25c3 /Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp | |
| parent | 25d5f0d9efd2af58b5389a358794ff10359e0164 (diff) | |
| parent | 6b109bd2a6c288c4d4461d9fbdb3d691ee6a4e6d (diff) | |
Merge pull request #8643 from jordan-woyak/mapping-race-fix
InputCommon/DolphinQt: Mapping related race fixes and cleanups.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp index dd5768e3f2..0052278b90 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp @@ -71,7 +71,7 @@ MappingWindow::MappingWindow(QWidget* parent, Type type, int port_num) timer->start(1000 / INDICATOR_UPDATE_FREQ); - GetController()->GetStateLock(); + const auto lock = GetController()->GetStateLock(); emit ConfigChanged(); } @@ -245,7 +245,7 @@ void MappingWindow::OnLoadProfilePressed() m_controller->LoadConfig(ini.GetOrCreateSection("Profile")); m_controller->UpdateReferences(g_controller_interface); - GetController()->GetStateLock(); + const auto lock = GetController()->GetStateLock(); emit ConfigChanged(); } @@ -438,7 +438,7 @@ void MappingWindow::OnDefaultFieldsPressed() m_controller->LoadDefaults(g_controller_interface); m_controller->UpdateReferences(g_controller_interface); - GetController()->GetStateLock(); + const auto lock = GetController()->GetStateLock(); emit ConfigChanged(); emit Save(); } @@ -455,7 +455,7 @@ void MappingWindow::OnClearFieldsPressed() m_controller->UpdateReferences(g_controller_interface); - GetController()->GetStateLock(); + const auto lock = GetController()->GetStateLock(); emit ConfigChanged(); emit Save(); } |
