diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 81192b4821..1a22971c87 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -50,6 +50,7 @@ #include "DiscIO/Enums.h" +#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoBackendBase.h" namespace BootManager @@ -142,7 +143,15 @@ bool BootCore(Core::System& system, std::unique_ptr boot, // Disable loading time emulation for Riivolution-patched games until we have proper emulation. if (!boot->riivolution_patches.empty()) + { Config::SetCurrent(Config::MAIN_FAST_DISC_SPEED, true); + } + else if (Config::Get(Config::MAIN_FAST_DISC_SPEED) && AchievementManager::GetInstance().IsHardcoreModeActive()) + { + Config::SetCurrent(Config::MAIN_FAST_DISC_SPEED, false); + + OSD::AddMessage("Emulate Disc Speed is enforced in Hardcore Mode."); + } system.Initialize();