diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 47fe6de856..f4190aa72c 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -337,7 +337,8 @@ static void CpuThread() if (!_CoreParameter.bCPUThread) g_video_backend->Video_Cleanup(); - EMM::UninstallExceptionHandler(); + if (_CoreParameter.bFastmem) + EMM::UninstallExceptionHandler(); return; }