summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-04 06:22:14 +0100
committerbunnei <bunneidev@gmail.com>2015-01-04 06:22:14 +0100
commitb058ce6feb28c8de9f7d1477c4b40175598c6791 (patch)
treed1ca3c09b48ccad17f688db8469dc18308fc49c5 /src
parentMerge pull request #401 from yuriks/filesys-leak (diff)
parentFrontends: Shutdown core when emulation is stopped (diff)
downloadyuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar.gz
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar.bz2
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar.lz
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar.xz
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.tar.zst
yuzu-b058ce6feb28c8de9f7d1477c4b40175598c6791.zip
Diffstat (limited to 'src')
-rw-r--r--src/citra/citra.cpp2
-rw-r--r--src/citra_qt/bootmanager.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index f6a52758b..69f0b35b3 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 6d08d6afc..e753ea108 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();
}