From 1c6a11ab142d18c3444629940f183b7c1865a5e2 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Thu, 10 Oct 2019 08:04:14 -0400
Subject: Kernel: Corrections to Wait Objects clearing in which a thread could
 still be signalled after a timeout or a cancel.

---
 src/core/hle/kernel/thread.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/hle/kernel/thread.h')

diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 4d220c4f9..ceb4d5159 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -319,6 +319,9 @@ public:
     }
 
     void ClearWaitObjects() {
+        for (const auto& waiting_object : wait_objects) {
+            waiting_object->RemoveWaitingThread(this);
+        }
         wait_objects.clear();
     }
 
-- 
cgit v1.2.3