Fix sys_semaphore_wait (on timeout)

2017-07-26 22:35:45 +03:00
parent 5d8640109d
commit 7fa42cfaad
1 changed files with 7 additions and 8 deletions
@@ -131,7 +131,13 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 			{
 				semaphore_lock lock(sem->mutex);

-				const s32 val = sem->val.fetch_op([](s32& val)
+				if (!sem->unqueue(sem->sq, &ppu))
+				{
+					timeout = 0;
+					continue;
+				}
+
+				verify(HERE), 0 > sem->val.fetch_op([](s32& val)
 				{
 					if (val < 0)
 					{
@@ -139,13 +145,6 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 					}
 				});

-				if (val >= 0)
-				{
-					timeout = 0;
-					continue;
-				}
-
-				verify(HERE), sem->unqueue(sem->sq, &ppu);
 				ppu.gpr[3] = CELL_ETIMEDOUT;
 				break;
 			}