From da3a9bfc968c51f214c127a56e2acef73f024a2c Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 24 Aug 2019 16:56:17 -0400 Subject: [PATCH] core: Reset cpu_core after kernel. - Fixes a crash on Android. core.cpp: check if video_dumper is created before trying to shut it down --- src/core/core.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index c376a908b..95e4035bd 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -541,11 +541,11 @@ void System::Shutdown(bool is_deserializing) { archive_manager.reset(); service_manager.reset(); dsp_core.reset(); - cpu_cores.clear(); kernel.reset(); + cpu_cores.clear(); timing.reset(); - if (video_dumper->IsDumping()) { + if (video_dumper && video_dumper->IsDumping()) { video_dumper->StopDumping(); }