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

GB Video: Fix potential hang when ending mode 0

This commit is contained in:
Vicki Pfau 2017-08-12 13:58:35 -07:00
parent dce3744677
commit 33fcd5ed84
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -17,6 +17,7 @@ Bugfixes:
- GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834) - GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834)
- Qt: Fix timezone issues with time overrides - Qt: Fix timezone issues with time overrides
- Qt: Fix sprite export pausing game indefinitely (fixes mgba.io/i/841) - Qt: Fix sprite export pausing game indefinitely (fixes mgba.io/i/841)
- GB Video: Fix potential hang when ending mode 0
Misc: Misc:
- Qt: Don't rebuild library view if style hasn't changed - Qt: Don't rebuild library view if style hasn't changed
- SDL: Fix 2.0.5 build on macOS under some circumstances - SDL: Fix 2.0.5 build on macOS under some circumstances

1
src/gb/video.c
View File

@ -154,6 +154,7 @@ void _endMode0(struct mTiming* timing, void* context, uint32_t cyclesLate) {
video->mode = 1; video->mode = 1;
video->modeEvent.callback = _endMode1; video->modeEvent.callback = _endMode1;
mTimingDeschedule(&video->p->timing, &video->frameEvent);
mTimingSchedule(&video->p->timing, &video->frameEvent, -cyclesLate); mTimingSchedule(&video->p->timing, &video->frameEvent, -cyclesLate);
if (!_statIRQAsserted(video, oldStat) && GBRegisterSTATIsOAMIRQ(video->stat)) { if (!_statIRQAsserted(video, oldStat) && GBRegisterSTATIsOAMIRQ(video->stat)) {