diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 5a8920401..de350de6f 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -674,6 +674,13 @@ void Settings::FixIncompatibleSettings(bool display_osd_messages) g_settings.rewind_enable = false; } + if (g_settings.IsRunaheadEnabled()) + { + // Block linking is good for performance, but hurts when regularly loading (i.e. runahead), since everything has to + // be unlinked. Which would be thousands of blocks. + g_settings.cpu_recompiler_block_linking = false; + } + // if challenge mode is enabled, disable things like rewind since they use save states if (Achievements::ChallengeModeActive()) {