Merge pull request #9948 from Dentomologist/fix_wiimotescanner_shutdown_crash

WiimoteReal: Fix Dolphin shutdown crash
This commit is contained in:
Tilka 2021-08-02 17:44:17 +01:00 committed by GitHub
commit 4b022a4bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -547,7 +547,7 @@ void WiimoteScanner::StartThread()
void WiimoteScanner::StopThread() void WiimoteScanner::StopThread()
{ {
if (m_scan_thread_running.TestAndClear()) if (m_scan_thread_running.IsSet())
{ {
SetScanMode(WiimoteScanMode::DO_NOT_SCAN); SetScanMode(WiimoteScanMode::DO_NOT_SCAN);
@ -556,6 +556,7 @@ void WiimoteScanner::StopThread()
backend->RequestStopSearching(); backend->RequestStopSearching();
} }
m_scan_thread_running.Clear();
m_scan_thread.join(); m_scan_thread.join();
} }
} }