ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AchievementManager: Fix unknown hash achievements deadlock 

Within AchievementManager, CloseGame being called when LoadGame fails was causing m_queue.Cancel to be called within a lock when Cancel itself locks until it is empty, causing a deadlock. This is resolved by cancelling the queues outside of the lock when they are safe to wait for resolutions.
This commit is contained in:
LillyJadeKatrin 2025-05-03 22:28:50 -04:00
parent 95ab6925b1
commit 6b52336bf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/AchievementManager.cpp
View File

@ -719,6 +719,8 @@ void AchievementManager::DoState(PointerWrap& p)
void AchievementManager::CloseGame()
{
m_queue.Cancel();
m_image_queue.Cancel();
{
std::lock_guard lg{m_lock};
m_active_challenges.clear();
@ -730,8 +732,6 @@ void AchievementManager::CloseGame()
m_locked_badges.clear();
m_leaderboard_map.clear();
m_rich_presence.fill('\0');
m_queue.Cancel();
m_image_queue.Cancel();
m_system.store(nullptr, std::memory_order_release);
if (Config::Get(Config::RA_DISCORD_PRESENCE_ENABLED))
Discord::UpdateDiscordPresence();