From cdde76f2aadeded8997aca004d6a9d9dcb07cff9 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 4 Jan 2015 01:04:17 -0200 Subject: Frontends: Shutdown core when emulation is stopped --- src/citra/citra.cpp | 2 ++ src/citra_qt/bootmanager.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index f6a52758..69f0b35b 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -51,6 +51,8 @@ int __cdecl main(int argc, char **argv) { Core::RunLoop(); } + System::Shutdown(); + delete emu_window; return 0; diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 6d08d6af..e753ea10 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -13,6 +13,7 @@ #include "core/core.h" #include "core/settings.h" +#include "core/system.h" #include "video_core/debug_utils/debug_utils.h" @@ -89,6 +90,8 @@ void EmuThread::Stop() } } LOG_INFO(Frontend, "EmuThread stopped"); + + System::Shutdown(); } -- cgit v1.2.3