From 06318fbdd28b3db25ee30382d03f1eafe9ddbcca Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 28 Jul 2021 22:32:12 -0700
Subject: [PATCH] GB Video: Render SGB border when unmasking with ATTR/PAL_SET
 (fixes #2261)

---
 CHANGES                     | 1 +
 src/gb/renderers/software.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index a5a4fe9de..a529e943a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ Features:
  - Additional scaling shaders
 Emulation fixes:
  - GB Memory: Add cursory cartridge open bus emulation (fixes mgba.io/i/2032)
+ - GB Video: Render SGB border when unmasking with ATTR/PAL_SET (fixes mgba.io/i/2261)
  - GBA: Improve timing when not booting from BIOS
  - GBA SIO: Fix SI value for unattached MULTI mode
  - GBA Video: Fix backdrop color if DISPCNT is first set to 0 (fixes mgba.io/i/2260)
diff --git a/src/gb/renderers/software.c b/src/gb/renderers/software.c
index acbe5a0a8..b8c997255 100644
--- a/src/gb/renderers/software.c
+++ b/src/gb/renderers/software.c
@@ -780,6 +780,9 @@ static void GBVideoSoftwareRendererFinishFrame(struct GBVideoRenderer* renderer)
 		case SGB_ATTR_SET:
 			if (softwareRenderer->sgbPacket[1] & 0x40) {
 				renderer->sgbRenderMode = 0;
+				if (softwareRenderer->sgbBorders) {
+					_regenerateSGBBorder(softwareRenderer);
+				}
 			}
 			break;
 		case SGB_PAL_TRN: