libretro/mgba
1
0
Fork 0
mirror of https://github.com/libretro/mgba.git synced 2024-11-23 16:10:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GBA: Fix hang when loading a savestate if sync to video is enabled

Browse Source
This commit is contained in:
Jeffrey Pfau 2015-04-22 20:41:54 -07:00
parent 255242a665
commit 242dc5067b
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -33,6 +33,7 @@ Bugfixes:
- 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: Handle saving input settings better

2
src/gba/serialize.c
View File

@ -178,7 +178,7 @@ static bool _loadPNGState(struct GBA* gba, struct VFile* vf) {
PNGReadFooter(png, end);
PNGReadClose(png, info, end);
gba->video.renderer->putPixels(gba->video.renderer, VIDEO_HORIZONTAL_PIXELS, pixels);
GBASyncPostFrame(gba->sync);
GBASyncForceFrame(gba->sync);
free(pixels);
return true;

10
src/gba/supervisor/thread.c
View File

@ -712,6 +712,16 @@ void GBASyncPostFrame(struct GBASync* sync) {
MutexUnlock(&sync->videoFrameMutex);
}
void GBASyncForceFrame(struct GBASync* sync) {
if (!sync) {
return;
}
MutexLock(&sync->videoFrameMutex);
ConditionWake(&sync->videoFrameAvailableCond);
MutexUnlock(&sync->videoFrameMutex);
}
bool GBASyncWaitFrameStart(struct GBASync* sync, int frameskip) {
if (!sync) {
return true;

1
src/gba/supervisor/thread.h
View File

@ -138,6 +138,7 @@ void GBAThreadTakeScreenshot(struct GBAThread* threadContext);
#endif
void GBASyncPostFrame(struct GBASync* sync);
void GBASyncForceFrame(struct GBASync* sync);
bool GBASyncWaitFrameStart(struct GBASync* sync, int frameskip);
void GBASyncWaitFrameEnd(struct GBASync* sync);
bool GBASyncDrawingFrame(struct GBASync* sync);