atomic.hpp: fixup for atomic waiting

2019-09-21 14:02:13 +03:00
parent feee3838eb
commit 74471e8ea3
1 changed files with 7 additions and 2 deletions
@@ -258,15 +258,20 @@ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_valu
 		{
 			if (value & s_waiter_mask)
 			{
-				value -= s_waiter_mask & -s_waiter_mask;
-
 #ifdef _WIN32
 				if (!fallback)
 				{
+					if ((value & s_signal_mask) == 0)
+					{
+						return false;
+					}
+
 					value -= s_signal_mask & -s_signal_mask;
 				}
 #endif

+				value -= s_waiter_mask & -s_waiter_mask;
+
 				if ((value & s_waiter_mask) == 0)
 				{
 					// Reset on last waiter