piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Config: Add [[nodiscard]] to AddConfigChangedCallback

Browse Source 
Require callers of Config::AddConfigChangedCallback and
CPUThreadConfigCallback::AddConfigChangedCallback to handle the returned
ConfigChangedCallbackIDs to hopefully prevent future issues with
callbacks getting called after their associated objects have been
destroyed.
This commit is contained in:
Dentomologist
2025-04-25 12:16:26 -07:00
parent 45b9def42c
commit 3a883f28d6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Config/Config.h
View File

@ -29,9 +29,9 @@ void AddLayer(std::unique_ptr<ConfigLayerLoader> loader);
std::shared_ptr<Layer> GetLayer(LayerType layer); std::shared_ptr<Layer> GetLayer(LayerType layer);
void RemoveLayer(LayerType layer); void RemoveLayer(LayerType layer);
// Returns an ID that can be passed to RemoveConfigChangedCallback(). // Returns an ID that should be passed to RemoveConfigChangedCallback() when the callback is no
// The callback may be called from any thread. // longer needed. The callback may be called from any thread.
ConfigChangedCallbackID AddConfigChangedCallback(ConfigChangedCallback func); [[nodiscard]] ConfigChangedCallbackID AddConfigChangedCallback(ConfigChangedCallback func);
void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id); void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id);
void OnConfigChanged(); void OnConfigChanged();

5
Source/Core/Core/CPUThreadConfigCallback.h
View File

@ -18,8 +18,9 @@ struct ConfigChangedCallbackID
bool operator==(const ConfigChangedCallbackID&) const = default; bool operator==(const ConfigChangedCallbackID&) const = default;
}; };
// returns an ID that can be passed to RemoveConfigChangedCallback() // Returns an ID that should be passed to RemoveConfigChangedCallback() when the callback is no
ConfigChangedCallbackID AddConfigChangedCallback(Config::ConfigChangedCallback func); // longer needed.
[[nodiscard]] ConfigChangedCallbackID AddConfigChangedCallback(Config::ConfigChangedCallback func);
void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id); void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id);