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
commit 4a45012f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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