piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12381 from AdmiralCurtiss/re-enable-achievement-nag

Browse Source 
AchievementManager: Only nag user about disabled achievements when they were actually enabled before.
This commit is contained in:
Mai
2023-12-10 20:16:24 -05:00
committed by GitHub
parent bdd28f1f26 70cd0040a3
commit c2b642d0b7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -846,21 +846,24 @@ AchievementManager::RichPresence AchievementManager::GetRichPresence()
void AchievementManager::SetDisabled(bool disable) void AchievementManager::SetDisabled(bool disable)
{ {
bool previously_disabled;
{ {
std::lock_guard lg{m_lock}; std::lock_guard lg{m_lock};
previously_disabled = m_disabled;
m_disabled = disable; m_disabled = disable;
if (disable && m_is_game_loaded)
CloseGame();
} }
if (disable)
if (!previously_disabled && disable && Config::Get(Config::RA_ENABLED))
{ {
INFO_LOG_FMT(ACHIEVEMENTS, "Achievement Manager has been disabled."); INFO_LOG_FMT(ACHIEVEMENTS, "Achievement Manager has been disabled.");
OSD::AddMessage("Please close all games to re-enable achievements.", OSD::Duration::VERY_LONG, OSD::AddMessage("Please close all games to re-enable achievements.", OSD::Duration::VERY_LONG,
OSD::Color::RED); OSD::Color::RED);
CloseGame();
} }
else
{ if (previously_disabled && !disable)
INFO_LOG_FMT(ACHIEVEMENTS, "Achievement Manager has been re-enabled."); INFO_LOG_FMT(ACHIEVEMENTS, "Achievement Manager has been re-enabled.");
}
}; };
const AchievementManager::NamedIconMap& AchievementManager::GetChallengeIcons() const const AchievementManager::NamedIconMap& AchievementManager::GetChallengeIcons() const