all repos — mgba @ 5d13a00cf751daa51aae95a0d064a3070ca0ee72

mGBA Game Boy Advance Emulator

GB Video: Fix frame end callbacks not getting called while screen is off
Vicki Pfau vi@endrift.com
Sun, 02 Apr 2017 00:37:33 -0700
commit

5d13a00cf751daa51aae95a0d064a3070ca0ee72

parent

4449361f5c61f6c13829bb1f37a706f652592f03

1 files changed, 8 insertions(+), 9 deletions(-)

jump to
M src/gb/video.c → src/gb/video.c 
@@ -128,14 +128,6 @@ if (GBRegisterSTATIsVblankIRQ(video->stat) || GBRegisterSTATIsOAMIRQ(video->stat)) {
 			video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
 		}
 		video->p->memory.io[REG_IF] |= (1 << GB_IRQ_VBLANK);
-
-		size_t c;
-		for (c = 0; c < mCoreCallbacksListSize(&video->p->coreCallbacks); ++c) {
-			struct mCoreCallbacks* callbacks = mCoreCallbacksListGetPointer(&video->p->coreCallbacks, c);
-			if (callbacks->videoFrameEnded) {
-				callbacks->videoFrameEnded(callbacks->context);
-			}
-		}
 	}
 	if (!GBRegisterSTATIsHblankIRQ(video->stat) && GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->ly) {
 		video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);

@@ -231,6 +223,14 @@ mTimingSchedule(timing, &video->frameEvent, 4 - ((video->p->cpu->executionState + 1) & 3));
 		return;
 	}
 
+	size_t c;
+	for (c = 0; c < mCoreCallbacksListSize(&video->p->coreCallbacks); ++c) {
+		struct mCoreCallbacks* callbacks = mCoreCallbacksListGetPointer(&video->p->coreCallbacks, c);
+		if (callbacks->videoFrameEnded) {
+			callbacks->videoFrameEnded(callbacks->context);
+		}
+	}
+
 	GBFrameEnded(video->p);
 	--video->frameskipCounter;
 	if (video->frameskipCounter < 0) {

@@ -247,7 +247,6 @@ video->renderer->getPixels(video->renderer, &stride, (const void**) &pixels);
 		video->p->stream->postVideoFrame(video->p->stream, pixels, stride);
 	}
 
-	size_t c;
 	for (c = 0; c < mCoreCallbacksListSize(&video->p->coreCallbacks); ++c) {
 		struct mCoreCallbacks* callbacks = mCoreCallbacksListGetPointer(&video->p->coreCallbacks, c);
 		if (callbacks->videoFrameStarted) {