Merge pull request #13630 from LillyJadeKatrin/retroachievements-wii-deadlock-fix

AchievementManager: Fix unknown hash achievements deadlock

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
index f5067f5d6e..24a3a418a0 100644
--- a/Source/Core/Core/AchievementManager.cpp
+++ b/Source/Core/Core/AchievementManager.cpp
@@ -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();