GB Video: Fix regression when disabling window mid-frame (fixes #1394)

2019-05-06 17:28:32 -07:00 · 2019-05-06 17:28:32 -07:00 · db8bb29c5a
parent af35438aaa
commit db8bb29c5a
12 changed files with 1 additions and 1 deletions
--- a/cinema/gb/window/kdt-battle/baseline_0000.png
+++ b/cinema/gb/window/kdt-battle/baseline_0000.png
--- a/cinema/gb/window/kdt-battle/baseline_0001.png
+++ b/cinema/gb/window/kdt-battle/baseline_0001.png
--- a/cinema/gb/window/kdt-battle/baseline_0002.png
+++ b/cinema/gb/window/kdt-battle/baseline_0002.png
--- a/cinema/gb/window/kdt-battle/baseline_0003.png
+++ b/cinema/gb/window/kdt-battle/baseline_0003.png
--- a/cinema/gb/window/kdt-battle/baseline_0004.png
+++ b/cinema/gb/window/kdt-battle/baseline_0004.png
--- a/cinema/gb/window/kdt-battle/baseline_0005.png
+++ b/cinema/gb/window/kdt-battle/baseline_0005.png
--- a/cinema/gb/window/kdt-battle/baseline_0006.png
+++ b/cinema/gb/window/kdt-battle/baseline_0006.png
--- a/cinema/gb/window/kdt-battle/baseline_0007.png
+++ b/cinema/gb/window/kdt-battle/baseline_0007.png
--- a/cinema/gb/window/kdt-battle/baseline_0008.png
+++ b/cinema/gb/window/kdt-battle/baseline_0008.png
--- a/cinema/gb/window/kdt-battle/baseline_0009.png
+++ b/cinema/gb/window/kdt-battle/baseline_0009.png
--- a/cinema/gb/window/kdt-battle/test.mvl
+++ b/cinema/gb/window/kdt-battle/test.mvl
--- a/src/gb/renderers/software.c
+++ b/src/gb/renderers/software.c
@ -508,7 +508,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
 		if (GBRegisterLCDCIsWindow(softwareRenderer->lcdc) && wy == y && wx <= endX) {
 			softwareRenderer->hasWindow = true;
 		}
-		if (softwareRenderer->hasWindow && wx <= endX) {
+		if (GBRegisterLCDCIsWindow(softwareRenderer->lcdc) && softwareRenderer->hasWindow && wx <= endX) {
 			if (wx > 0 && !softwareRenderer->d.disableBG) {
 				GBVideoSoftwareRendererDrawBackground(softwareRenderer, maps, startX, wx, softwareRenderer->scx - softwareRenderer->offsetScx, softwareRenderer->scy + y - softwareRenderer->offsetScy);
 			}