mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-08-17 15:58:16 -05:00
Merge pull request #14493 from LillyJadeKatrin/retroachievements-resident-evil-fix
Remove AchievementManager ChangeDisc call from Eject
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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, {});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user