GBA: Fix hang when loading a savestate if sync to video is enabled
Jeffrey Pfau jeffrey@endrift.com
Wed, 22 Apr 2015 20:40:52 -0700
2 files changed,
4 insertions(+),
0 deletions(-)
M
CHANGES
→
CHANGES
@@ -17,6 +17,7 @@ - Qt: Fix controller axis querying
- GBA Memory: Fix 32-bit loads from unaddress cartridge space - Qt: Fix multiplayer windows opening as the wrong size - Qt: Fix controllers sometimes not loading the right profile + - GBA: Fix hang when loading a savestate if sync to video is enabled Misc: - Qt: Show multiplayer numbers in window title - Qt: Solar sensor can have shortcuts set
M
src/gba/serialize.c
→
src/gba/serialize.c
@@ -178,7 +178,10 @@ PNGReadPixels(png, info, pixels, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, VIDEO_HORIZONTAL_PIXELS);
PNGReadFooter(png, end); PNGReadClose(png, info, end); gba->video.renderer->putPixels(gba->video.renderer, VIDEO_HORIZONTAL_PIXELS, pixels); + bool videoFrameWait = gba->sync->videoFrameWait; + gba->sync->videoFrameWait = false; GBASyncPostFrame(gba->sync); + gba->sync->videoFrameWait = videoFrameWait; free(pixels); return true;