ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qt

This commit is contained in:
Jeffrey Pfau 2014-10-15 04:57:20 -07:00
parent ca128a97ea 69d041d373
commit 0579ececb3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gba/gba-thread.c
View File

@ -520,10 +520,12 @@ void GBASyncPostFrame(struct GBASync* sync) {
++sync->videoFramePending; ++sync->videoFramePending;
--sync->videoFrameSkip; --sync->videoFrameSkip;
if (sync->videoFrameSkip < 0) { if (sync->videoFrameSkip < 0) {
do {
ConditionWake(&sync->videoFrameAvailableCond); ConditionWake(&sync->videoFrameAvailableCond);
while (sync->videoFrameWait && sync->videoFramePending) { if (sync->videoFrameWait) {
ConditionWait(&sync->videoFrameRequiredCond, &sync->videoFrameMutex); ConditionWait(&sync->videoFrameRequiredCond, &sync->videoFrameMutex);
} }
} while (sync->videoFrameWait && sync->videoFramePending);
} }
MutexUnlock(&sync->videoFrameMutex); MutexUnlock(&sync->videoFrameMutex);