From e55f9ed1022a799b4f8ec8fec6ff84356b05a0f3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 13:18:02 -0500 Subject: AchievementManager: Make GetInstance() return a reference The internal static member will always have a valid lifetime. Makes this consistent with other instance based objects in our code. --- Source/Core/VideoCommon/OnScreenUI.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoCommon/OnScreenUI.cpp') diff --git a/Source/Core/VideoCommon/OnScreenUI.cpp b/Source/Core/VideoCommon/OnScreenUI.cpp index 11953b2f4c..254ff6f2bb 100644 --- a/Source/Core/VideoCommon/OnScreenUI.cpp +++ b/Source/Core/VideoCommon/OnScreenUI.cpp @@ -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"; -- cgit v1.2.3 From d90537cc18df27a5e893beb767d8801131820659 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 13:51:47 -0500 Subject: AchievementManager: Return by reference from GetLock() This makes the API a little nicer to use, since you don't need to do a mandatory dereference when passing the lock into any kind of scope guard. --- Source/Core/VideoCommon/OnScreenUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/OnScreenUI.cpp') diff --git a/Source/Core/VideoCommon/OnScreenUI.cpp b/Source/Core/VideoCommon/OnScreenUI.cpp index 254ff6f2bb..88141736e4 100644 --- a/Source/Core/VideoCommon/OnScreenUI.cpp +++ b/Source/Core/VideoCommon/OnScreenUI.cpp @@ -330,7 +330,7 @@ void OnScreenUI::DrawDebugText() #ifdef USE_RETRO_ACHIEVEMENTS void OnScreenUI::DrawChallenges() { - std::lock_guard lg{*AchievementManager::GetInstance().GetLock()}; + std::lock_guard lg{AchievementManager::GetInstance().GetLock()}; const auto& challenge_icons = AchievementManager::GetInstance().GetChallengeIcons(); if (challenge_icons.empty()) return; -- cgit v1.2.3