From 28e55d29f2bd02639e7f2e898b53157df5afcf38 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 24 Feb 2015 04:52:37 -0600 Subject: [PATCH] Fix a crash with fastmem disabled. When the core is busy shutting down only uninstall the exception handler if fastmem is actually enabled. We only install when fastmem is enabled, so only uninstall when it is as well. Fixes a crash I was getting on ARMv7. --- Source/Core/Core/Core.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; }