summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-02-11 12:29:46 +0100
committerGitHub <noreply@github.com>2017-02-11 12:29:46 +0100
commitda6a40e3d1beaf17847b973d0389a2d9ab66aa9b (patch)
treedcd6022b0ff356f91659b3947020551c6f919127 /src/core/core.cpp
parenthid: remove the touch field from PadState (#2557) (diff)
downloadyuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar.gz
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar.bz2
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar.lz
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar.xz
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.tar.zst
yuzu-da6a40e3d1beaf17847b973d0389a2d9ab66aa9b.zip
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 202cd332b..c9c9b7615 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -67,10 +67,6 @@ System::ResultStatus System::SingleStep() {
}
System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) {
- if (app_loader) {
- app_loader.reset();
- }
-
app_loader = Loader::GetLoader(filepath);
if (!app_loader) {
@@ -123,10 +119,6 @@ void System::Reschedule() {
}
System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
- if (cpu_core) {
- cpu_core.reset();
- }
-
Memory::Init();
if (Settings::values.use_cpu_jit) {
@@ -159,7 +151,8 @@ void System::Shutdown() {
Kernel::Shutdown();
HW::Shutdown();
CoreTiming::Shutdown();
- cpu_core.reset();
+ cpu_core = nullptr;
+ app_loader = nullptr;
LOG_DEBUG(Core, "Shutdown OK");
}