Merge pull request #14493 from LillyJadeKatrin/retroachievements-resident-evil-fix

Remove AchievementManager ChangeDisc call from Eject
This commit is contained in:
JosJuice
2026-04-09 17:22:52 +02:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@@ -170,6 +170,8 @@ void AchievementManager::LoadGame(const DiscIO::Volume* volume)
WARN_LOG_FMT(ACHIEVEMENTS, "Software format unsupported by AchievementManager.");
if (rc_client_get_game_info(m_client))
{
OSD::AddMessage("Unsupported media change; disabling achievements.", OSD::Duration::VERY_LONG,
OSD::Color::RED);
CloseGame();
}
else

View File

@@ -442,7 +442,6 @@ void DVDInterface::AutoChangeDiscCallback(Core::System& system, u64 userdata, s6
void DVDInterface::EjectDiscCallback(Core::System& system, u64 userdata, s64 cyclesLate)
{
AchievementManager::GetInstance().ChangeDisc(nullptr);
system.GetDVDInterface().SetDisc(nullptr, {});
}