diff options
| author | 2018-10-05 13:41:54 -0400 | |
|---|---|---|
| committer | 2018-10-05 13:41:54 -0400 | |
| commit | e51d715700a35a8f14e5b804b6f7553c9a40888b (patch) | |
| tree | 96917effcab47b089718a90851b2b203717d324a /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #1442 from lioncash/format (diff) | |
| parent | kernel/thread: Make all instance variables private (diff) | |
| download | yuzu-e51d715700a35a8f14e5b804b6f7553c9a40888b.tar.gz yuzu-e51d715700a35a8f14e5b804b6f7553c9a40888b.tar.xz yuzu-e51d715700a35a8f14e5b804b6f7553c9a40888b.zip | |
Merge pull request #1439 from lioncash/thread
kernel/thread: Make all instance variables private
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index dc9fc8470..fb0027a71 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -144,15 +144,15 @@ void Process::PrepareForTermination() { | |||
| 144 | 144 | ||
| 145 | const auto stop_threads = [this](const std::vector<SharedPtr<Thread>>& thread_list) { | 145 | const auto stop_threads = [this](const std::vector<SharedPtr<Thread>>& thread_list) { |
| 146 | for (auto& thread : thread_list) { | 146 | for (auto& thread : thread_list) { |
| 147 | if (thread->owner_process != this) | 147 | if (thread->GetOwnerProcess() != this) |
| 148 | continue; | 148 | continue; |
| 149 | 149 | ||
| 150 | if (thread == GetCurrentThread()) | 150 | if (thread == GetCurrentThread()) |
| 151 | continue; | 151 | continue; |
| 152 | 152 | ||
| 153 | // TODO(Subv): When are the other running/ready threads terminated? | 153 | // TODO(Subv): When are the other running/ready threads terminated? |
| 154 | ASSERT_MSG(thread->status == ThreadStatus::WaitSynchAny || | 154 | ASSERT_MSG(thread->GetStatus() == ThreadStatus::WaitSynchAny || |
| 155 | thread->status == ThreadStatus::WaitSynchAll, | 155 | thread->GetStatus() == ThreadStatus::WaitSynchAll, |
| 156 | "Exiting processes with non-waiting threads is currently unimplemented"); | 156 | "Exiting processes with non-waiting threads is currently unimplemented"); |
| 157 | 157 | ||
| 158 | thread->Stop(); | 158 | thread->Stop(); |