The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 15:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Mark GetStateLock with [[nodiscard]] and fix discarding calls.

Browse Source
This commit is contained in:
Jordan Woyak 2020-02-23 09:34:31 -06:00
parent 25d5f0d9ef
commit 1a3b4d91bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
View File

@ -71,7 +71,7 @@ MappingWindow::MappingWindow(QWidget* parent, Type type, int port_num)
timer->start(1000 / INDICATOR_UPDATE_FREQ); timer->start(1000 / INDICATOR_UPDATE_FREQ);
GetController()->GetStateLock(); const auto lock = GetController()->GetStateLock();
emit ConfigChanged(); emit ConfigChanged();
} }
@ -245,7 +245,7 @@ void MappingWindow::OnLoadProfilePressed()
m_controller->LoadConfig(ini.GetOrCreateSection("Profile")); m_controller->LoadConfig(ini.GetOrCreateSection("Profile"));
m_controller->UpdateReferences(g_controller_interface); m_controller->UpdateReferences(g_controller_interface);
GetController()->GetStateLock(); const auto lock = GetController()->GetStateLock();
emit ConfigChanged(); emit ConfigChanged();
} }
@ -438,7 +438,7 @@ void MappingWindow::OnDefaultFieldsPressed()
m_controller->LoadDefaults(g_controller_interface); m_controller->LoadDefaults(g_controller_interface);
m_controller->UpdateReferences(g_controller_interface); m_controller->UpdateReferences(g_controller_interface);
GetController()->GetStateLock(); const auto lock = GetController()->GetStateLock();
emit ConfigChanged(); emit ConfigChanged();
emit Save(); emit Save();
} }
@ -455,7 +455,7 @@ void MappingWindow::OnClearFieldsPressed()
m_controller->UpdateReferences(g_controller_interface); m_controller->UpdateReferences(g_controller_interface);
GetController()->GetStateLock(); const auto lock = GetController()->GetStateLock();
emit ConfigChanged(); emit ConfigChanged();
emit Save(); emit Save();
} }

2
Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
View File

@ -153,7 +153,7 @@ public:
// references and GetState(), by extension. This prevents a race condition // references and GetState(), by extension. This prevents a race condition
// which happens while handling a hotplug event because a control reference's State() // which happens while handling a hotplug event because a control reference's State()
// could be called before we have finished updating the reference. // could be called before we have finished updating the reference.
static std::unique_lock<std::recursive_mutex> GetStateLock(); [[nodiscard]] static std::unique_lock<std::recursive_mutex> GetStateLock();
std::vector<std::unique_ptr<ControlGroup>> groups; std::vector<std::unique_ptr<ControlGroup>> groups;