summaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2022-10-19 16:27:43 -0400
committerGitHub <noreply@github.com>2022-10-19 16:27:43 -0400
commit560bca57a203c45acb1c589699b472223e8b68fd (patch)
tree98ef4a0d62a368614075463d13c4220b11af9760 /src/yuzu
parentb8a70c9999b9a09d7028a617040719bf5341cf6d (diff)
parent97879faea43c1fad6cbb0b63573c75644705e2e9 (diff)
Merge pull request #9071 from bunnei/mp-mm
Kernel Multiprocess (Part 1) - Persist memory & core timing
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/bootmanager.cpp4
-rw-r--r--src/yuzu/main.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 24251247d..6acfb7b06 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -120,8 +120,8 @@ void EmuThread::run() {
}
}
- // Shutdown the core emulation
- system.Shutdown();
+ // Shutdown the main emulated process
+ system.ShutdownMainProcess();
#if MICROPROFILE_ENABLED
MicroProfileOnThreadExit();
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index a94624be6..501c34255 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -294,6 +294,7 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
#ifdef __linux__
SetupSigInterrupts();
#endif
+ system->Initialize();
Common::Log::Initialize();
LoadTranslation();