1
0
Fork 0

Fix the merge

This commit is contained in:
Hamish Milne 2020-04-13 11:50:27 +01:00
parent e733eed6bd
commit 4d6bd9b569
1 changed files with 1 additions and 1 deletions

View File

@ -216,7 +216,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
std::vector<std::unique_ptr<WaitTreeItem>> list(WaitTreeWaitObject::GetChildren()); std::vector<std::unique_ptr<WaitTreeItem>> list(WaitTreeWaitObject::GetChildren());
const auto& thread = static_cast<const Kernel::Thread&>(object); const auto& thread = static_cast<const Kernel::Thread&>(object);
const auto* process = thread.owner_process; const auto& process = thread.owner_process;
QString processor; QString processor;
switch (thread.processor_id) { switch (thread.processor_id) {