Merge pull request #2116 from Sonicadvance1/fix_exception_handler_crash

Fix a crash with fastmem disabled.
2015-02-24 12:02:22 +01:00 · 2015-02-24 12:02:22 +01:00 · be6a151355
parent 84f8547556 28e55d29f2
commit be6a151355
1 changed files with 2 additions and 1 deletions
--- 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;
 }