mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 19:58:53 +00:00
Fix the Host_GetKeyState deadlock caused by Billiard's latest changes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7304 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9abf449e7c
commit
024a87af7a
5 changed files with 9 additions and 4 deletions
|
@ -71,6 +71,10 @@ private:
|
|||
class Barrier
|
||||
{
|
||||
public:
|
||||
Barrier()
|
||||
: m_count(2), m_waiting(0)
|
||||
{}
|
||||
|
||||
Barrier(size_t count)
|
||||
: m_count(count), m_waiting(0)
|
||||
{}
|
||||
|
@ -80,7 +84,7 @@ public:
|
|||
{
|
||||
std::unique_lock<std::mutex> lk(m_mutex);
|
||||
|
||||
if (m_count == ++m_waiting)
|
||||
if (m_count >= ++m_waiting)
|
||||
{
|
||||
m_waiting = 0;
|
||||
m_condvar.notify_all();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue