From 4d6bd9b569fca16325d6c3968bd68d4a6290c172 Mon Sep 17 00:00:00 2001
From: Hamish Milne <hamishmilne83@gmail.com>
Date: Mon, 13 Apr 2020 11:50:27 +0100
Subject: [PATCH] Fix the merge

---
 src/citra_qt/debugger/wait_tree.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/citra_qt/debugger/wait_tree.cpp b/src/citra_qt/debugger/wait_tree.cpp
index 66b047e75..32ee7a1df 100644
--- a/src/citra_qt/debugger/wait_tree.cpp
+++ b/src/citra_qt/debugger/wait_tree.cpp
@@ -216,7 +216,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
     std::vector<std::unique_ptr<WaitTreeItem>> list(WaitTreeWaitObject::GetChildren());
 
     const auto& thread = static_cast<const Kernel::Thread&>(object);
-    const auto* process = thread.owner_process;
+    const auto& process = thread.owner_process;
 
     QString processor;
     switch (thread.processor_id) {