diff options
| author |  Liam | 2023-02-15 18:16:04 -0500 |
|---|---|---|
| committer | Liam | 2023-02-21 12:19:25 -0500 |
| commit | 23151ff498993badb341ddf6de5ed38a5833e41c (patch) | |
| tree | 35e1554c253e3169ab9b4510699750242e3488c9 /src/core | |
| parent | Merge pull request #9834 from german77/reverted (diff) | |
| download | yuzu-23151ff498993badb341ddf6de5ed38a5833e41c.tar.gz yuzu-23151ff498993badb341ddf6de5ed38a5833e41c.tar.xz yuzu-23151ff498993badb341ddf6de5ed38a5833e41c.zip | |
core: defer cpu shutdown
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index fb9b25d12..2683533b8 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -380,9 +380,7 @@ struct System::Impl { | |||
| 380 | gpu_core->NotifyShutdown(); | 380 | gpu_core->NotifyShutdown(); |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | kernel.ShutdownCores(); | 383 | kernel.SuspendApplication(true); |
| 384 | cpu_manager.Shutdown(); | ||
| 385 | debugger.reset(); | ||
| 386 | if (services) { | 384 | if (services) { |
| 387 | services->KillNVNFlinger(); | 385 | services->KillNVNFlinger(); |
| 388 | } | 386 | } |
| @@ -398,6 +396,9 @@ struct System::Impl { | |||
| 398 | gpu_core.reset(); | 396 | gpu_core.reset(); |
| 399 | host1x_core.reset(); | 397 | host1x_core.reset(); |
| 400 | perf_stats.reset(); | 398 | perf_stats.reset(); |
| 399 | kernel.ShutdownCores(); | ||
| 400 | cpu_manager.Shutdown(); | ||
| 401 | debugger.reset(); | ||
| 401 | kernel.Shutdown(); | 402 | kernel.Shutdown(); |
| 402 | memory.Reset(); | 403 | memory.Reset(); |
| 403 | 404 | ||