Merge pull request #12389 from lioncash/cheeve

AchievementManager: Make GetInstance() and GetLock() return a reference
This commit is contained in:
Admiral H. Curtiss
2023-12-11 23:37:29 +01:00
committed by GitHub
22 changed files with 87 additions and 117 deletions

View File

@ -330,10 +330,9 @@ void OnScreenUI::DrawDebugText()
#ifdef USE_RETRO_ACHIEVEMENTS
void OnScreenUI::DrawChallenges()
{
std::lock_guard lg{*AchievementManager::GetInstance()->GetLock()};
const AchievementManager::NamedIconMap& challenge_icons =
AchievementManager::GetInstance()->GetChallengeIcons();
if (challenge_icons.size() == 0)
std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
const auto& challenge_icons = AchievementManager::GetInstance().GetChallengeIcons();
if (challenge_icons.empty())
return;
const std::string window_name = "Challenges";