Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-28 21:08:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

AchievementManager: Remove ConfigChangedCallback on shutdown

Browse source 
Prevent SetHardcoreMode from being called after m_client is set to
nullptr. rc_client_set_hardcore_enabled() checks for nullptr so this
didn't cause any problems, but better not to rely on that.

Also prevents multiple SetHardcoreMode callbacks from piling up when
repeatedly toggling Config::RA_ENABLED.
This commit is contained in:
Dentomologist 2025-04-24 14:02:10 -07:00
parent e37a195192
commit 9c40a7976b
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/Core/AchievementManager.cpp
View file

@ -76,7 +76,7 @@ void AchievementManager::Init(void* hwnd)
[](const char* message, const rc_client_t* client) { [](const char* message, const rc_client_t* client) {
INFO_LOG_FMT(ACHIEVEMENTS, "{}", message); INFO_LOG_FMT(ACHIEVEMENTS, "{}", message);
}); });
Config::AddConfigChangedCallback([this] { SetHardcoreMode(); }); m_config_changed_callback_id = Config::AddConfigChangedCallback([this] { SetHardcoreMode(); });
SetHardcoreMode(); SetHardcoreMode();
m_queue.Reset("AchievementManagerQueue", [](const std::function<void()>& func) { func(); }); m_queue.Reset("AchievementManagerQueue", [](const std::function<void()>& func) { func(); });
m_image_queue.Reset("AchievementManagerImageQueue", m_image_queue.Reset("AchievementManagerImageQueue",
@ -764,6 +764,7 @@ void AchievementManager::Shutdown()
{ {
CloseGame(); CloseGame();
m_queue.Shutdown(); m_queue.Shutdown();
Config::RemoveConfigChangedCallback(m_config_changed_callback_id);
std::lock_guard lg{m_lock}; std::lock_guard lg{m_lock};
// DON'T log out - keep those credentials for next run. // DON'T log out - keep those credentials for next run.
rc_client_destroy(m_client); rc_client_destroy(m_client);

2
Source/Core/Core/AchievementManager.h
View file

@ -26,6 +26,7 @@
#include <rcheevos/include/rc_runtime.h> #include <rcheevos/include/rc_runtime.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
#include "Common/Event.h" #include "Common/Event.h"
#include "Common/HttpRequest.h" #include "Common/HttpRequest.h"
#include "Common/JsonUtil.h" #include "Common/JsonUtil.h"
@ -264,6 +265,7 @@ private:
bool m_is_runtime_initialized = false; bool m_is_runtime_initialized = false;
UpdateCallback m_update_callback = [](const UpdatedItems&) {}; UpdateCallback m_update_callback = [](const UpdatedItems&) {};
std::unique_ptr<DiscIO::Volume> m_loading_volume; std::unique_ptr<DiscIO::Volume> m_loading_volume;
Config::ConfigChangedCallbackID m_config_changed_callback_id;
Badge m_default_player_badge; Badge m_default_player_badge;
Badge m_default_game_badge; Badge m_default_game_badge;
Badge m_default_unlocked_badge; Badge m_default_unlocked_badge;