From cb127509e1e55f31bc55cd72676de421f904cdb0 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Fri, 23 Jul 2021 17:12:06 -0700 Subject: [PATCH] WiimoteReal: Fix Dolphin shutdown crash Clear m_scan_thread_running later to avoid accessing m_backends after it has been cleared. --- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 6439b9f5b4..92dbaeeef0 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -547,7 +547,7 @@ void WiimoteScanner::StartThread() void WiimoteScanner::StopThread() { - if (m_scan_thread_running.TestAndClear()) + if (m_scan_thread_running.IsSet()) { SetScanMode(WiimoteScanMode::DO_NOT_SCAN); @@ -556,6 +556,7 @@ void WiimoteScanner::StopThread() backend->RequestStopSearching(); } + m_scan_thread_running.Clear(); m_scan_thread.join(); } }