diff --git a/src/core/achievements.h b/src/core/achievements.h index d4eb68dd4..fbfc8c728 100644 --- a/src/core/achievements.h +++ b/src/core/achievements.h @@ -74,7 +74,7 @@ void Logout(); /// Called when the system changes game, or is booting. void GameChanged(const std::string& path, CDImage* image); -/// Re-enables hardcode mode if it is enabled in the settings. +/// Re-enables hardcore mode if it is enabled in the settings. bool ResetHardcoreMode(); /// Forces hardcore mode off until next reset. diff --git a/src/core/system.cpp b/src/core/system.cpp index ade6cd96a..11caa67f6 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1084,7 +1084,12 @@ void System::ResetSystem() return; if (Achievements::ResetHardcoreMode()) + { + // Make sure a pre-existing cheat file hasn't been loaded when resetting + // after enabling HC mode. + s_cheat_list.reset(); ApplySettings(false); + } InternalReset(); ResetPerformanceCounters();