diff options
| author | 2022-06-13 15:48:03 -0700 | |
|---|---|---|
| committer | 2022-06-13 15:48:03 -0700 | |
| commit | 741da9c8bfaa77f96d4c7ddbc82346b2322491db (patch) | |
| tree | d309493a62422a627f7b42aa5f582ce55b68e123 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #8446 from liamwhite/cmd-gdb (diff) | |
| parent | CpuManager: simplify pausing (diff) | |
| download | yuzu-741da9c8bfaa77f96d4c7ddbc82346b2322491db.tar.gz yuzu-741da9c8bfaa77f96d4c7ddbc82346b2322491db.tar.xz yuzu-741da9c8bfaa77f96d4c7ddbc82346b2322491db.zip | |
Merge pull request #8388 from liamwhite/simpler-pause
CpuManager: simplify pausing
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 92f6d8c49..7eb961912 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -252,6 +252,7 @@ struct KernelCore::Impl { | |||
| 252 | core_id) | 252 | core_id) |
| 253 | .IsSuccess()); | 253 | .IsSuccess()); |
| 254 | suspend_threads[core_id]->SetName(fmt::format("SuspendThread:{}", core_id)); | 254 | suspend_threads[core_id]->SetName(fmt::format("SuspendThread:{}", core_id)); |
| 255 | suspend_threads[core_id]->DisableDispatch(); | ||
| 255 | } | 256 | } |
| 256 | } | 257 | } |
| 257 | 258 | ||
| @@ -1073,9 +1074,6 @@ void KernelCore::Suspend(bool in_suspention) { | |||
| 1073 | impl->suspend_threads[core_id]->SetState(state); | 1074 | impl->suspend_threads[core_id]->SetState(state); |
| 1074 | impl->suspend_threads[core_id]->SetWaitReasonForDebugging( | 1075 | impl->suspend_threads[core_id]->SetWaitReasonForDebugging( |
| 1075 | ThreadWaitReasonForDebugging::Suspended); | 1076 | ThreadWaitReasonForDebugging::Suspended); |
| 1076 | if (!should_suspend) { | ||
| 1077 | impl->suspend_threads[core_id]->DisableDispatch(); | ||
| 1078 | } | ||
| 1079 | } | 1077 | } |
| 1080 | } | 1078 | } |
| 1081 | } | 1079 | } |