archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 05:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Hotfix: useless error

Browse source
This commit is contained in:
Nekotekina 2020-12-16 11:07:02 +03:00
parent 3dbecada4e
commit 6b3f722ff0
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Utilities/Thread.cpp
View file

@ -2287,10 +2287,16 @@ thread_base::~thread_base()
}
}
bool thread_base::join() const
bool thread_base::join(bool dtor) const
{
// Check if already finished
if (m_sync & 2)
{
return (m_sync & 3) == 3;
}
// Hacked for too sleepy threads (1ms) TODO: make sure it's unneeded and remove
const auto timeout = Emu.IsStopped() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf;
const auto timeout = dtor && Emu.IsStopped() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf;
bool warn = false;
auto stamp0 = __rdtsc();