ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12952 from LillyJadeKatrin/retroachievements-change-discs-bug 

Fixed achievements not working after a disc change.
This commit is contained in:
JMC47 2024-07-31 19:58:21 -04:00 committed by GitHub
parent 0c18393691 347aab7ab3
commit 8a50676b83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,6 @@ void AchievementManager::LoadGame(const std::string& file_path, const DiscIO::Vo
rc_client_set_unofficial_enabled(m_client, Config::Get(Config::RA_UNOFFICIAL_ENABLED)); rc_client_set_unofficial_enabled(m_client, Config::Get(Config::RA_UNOFFICIAL_ENABLED));
rc_client_set_encore_mode_enabled(m_client, Config::Get(Config::RA_ENCORE_ENABLED)); rc_client_set_encore_mode_enabled(m_client, Config::Get(Config::RA_ENCORE_ENABLED));
rc_client_set_spectator_mode_enabled(m_client, Config::Get(Config::RA_SPECTATOR_ENABLED)); rc_client_set_spectator_mode_enabled(m_client, Config::Get(Config::RA_SPECTATOR_ENABLED));
rc_client_set_read_memory_function(m_client, MemoryVerifier);
if (volume) if (volume)
{ {
std::lock_guard lg{m_lock}; std::lock_guard lg{m_lock};
@ -181,6 +180,7 @@ void AchievementManager::LoadGame(const std::string& file_path, const DiscIO::Vo
} }
else else
{ {
rc_client_set_read_memory_function(m_client, MemoryVerifier);
rc_client_begin_identify_and_load_game(m_client, RC_CONSOLE_GAMECUBE, file_path.c_str(), NULL, rc_client_begin_identify_and_load_game(m_client, RC_CONSOLE_GAMECUBE, file_path.c_str(), NULL,
0, LoadGameCallback, NULL); 0, LoadGameCallback, NULL);
} }
@ -863,7 +863,9 @@ void AchievementManager::ChangeMediaCallback(int result, const char* error_messa
{ {
AchievementManager::GetInstance().m_loading_volume.reset(nullptr); AchievementManager::GetInstance().m_loading_volume.reset(nullptr);
if (result == RC_OK) if (result == RC_OK)
{
return; return;
}
if (result == RC_HARDCORE_DISABLED) if (result == RC_HARDCORE_DISABLED)
{ {
@ -876,7 +878,6 @@ void AchievementManager::ChangeMediaCallback(int result, const char* error_messa
ERROR_LOG_FMT(ACHIEVEMENTS, "RetroAchievements media change failed: {}", error_message); ERROR_LOG_FMT(ACHIEVEMENTS, "RetroAchievements media change failed: {}", error_message);
} }
rc_client_set_read_memory_function(AchievementManager::GetInstance().m_client, MemoryPeeker);
} }
void AchievementManager::DisplayWelcomeMessage() void AchievementManager::DisplayWelcomeMessage()