yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #6020 from bunnei/shutdown-crash-2 

core: Shutdown: Move kernel cleanup to later in shutdown.
This commit is contained in:
LC 2021-03-02 09:28:28 -05:00 committed by GitHub
parent cd25817938 925671071c
commit 4a45012f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/core.cpp
View File

@ -299,28 +299,17 @@ struct System::Impl {
gpu_core->WaitIdle(); gpu_core->WaitIdle();
} }
// Shutdown emulation session
services.reset(); services.reset();
service_manager.reset(); service_manager.reset();
cheat_engine.reset(); cheat_engine.reset();
telemetry_session.reset(); telemetry_session.reset();
// Close all CPU/threading state
cpu_manager.Shutdown(); cpu_manager.Shutdown();
// Release the Time Manager's resources
time_manager.Shutdown(); time_manager.Shutdown();
// Shutdown kernel and core timing
core_timing.Shutdown(); core_timing.Shutdown();
kernel.Shutdown();
// Close app loader
app_loader.reset(); app_loader.reset();
gpu_core.reset(); gpu_core.reset();
perf_stats.reset(); perf_stats.reset();
kernel.Shutdown();
// Clear all applets
applet_manager.ClearAll(); applet_manager.ClearAll();
LOG_DEBUG(Core, "Shutdown OK"); LOG_DEBUG(Core, "Shutdown OK");