Merge pull request #12229 from AdmiralCurtiss/achievement-load-async-…

…lock AchievementManager: Call ActivateDeactivateLeaderboards() and ActivateDeactivateRichPresence() under lock.
dolphin-emu · Oct 15, 2023 · daf9ff0 · daf9ff0
2 parents b3b660b + 1645b1e
commit daf9ff0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
@@ -191,6 +191,8 @@ void AchievementManager::LoadGameByFilenameAsync(const std::string& iso_path,
       m_is_game_loaded = true;
       LoadUnlockData([](ResponseType r_type) {});
       ActivateDeactivateAchievements();
+      ActivateDeactivateLeaderboards();
+      ActivateDeactivateRichPresence();
       PointSpread spread = TallyScore();
       if (hardcore_mode_enabled)
       {
@@ -209,8 +211,6 @@ void AchievementManager::LoadGameByFilenameAsync(const std::string& iso_path,
         OSD::AddMessage("Hardcore mode is OFF", OSD::Duration::VERY_LONG, OSD::Color::CYAN);
       }
     }
-    ActivateDeactivateLeaderboards();
-    ActivateDeactivateRichPresence();
     FetchBadges();
     // Reset this to zero so that RP immediately triggers on the first frame
     m_last_ping_time = 0;