Merge pull request #2116 from Sonicadvance1/fix_exception_handler_crash

Fix a crash with fastmem disabled.
dolphin-emu · Feb 24, 2015 · be6a151 · be6a151
2 parents 84f8547 + 28e55d2
commit be6a151
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
 }