From f349ca93c623c9148637af61ff8005f17ac31cc0 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 22 Apr 2019 12:18:06 -0700
Subject: [PATCH] GB Core: Fix toggling WIN and OBJ being swapped

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

diff --git a/CHANGES b/CHANGES
index f4512cdbf..3cf10eb44 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Other fixes:
  - CMake: Fix .deb imagemagick dependencies
  - Qt: Fix crash in sprite viewer magnification (fixes mgba.io/i/1362)
  - 3DS: Ensure core 2 can be used for threaded renderer (fixes mgba.io/i/1371)
+ - GB Core: Fix toggling WIN and OBJ being swapped
 Misc:
  - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
  - Qt: Improve camera initialization
diff --git a/src/gb/core.c b/src/gb/core.c
index 5185e9a69..5afc73444 100644
--- a/src/gb/core.c
+++ b/src/gb/core.c
@@ -816,10 +816,10 @@ static void _GBCoreEnableVideoLayer(struct mCore* core, size_t id, bool enable)
 		gb->video.renderer->disableBG = !enable;
 		break;
 	case 1:
-		gb->video.renderer->disableOBJ = !enable;
+		gb->video.renderer->disableWIN = !enable;
 		break;
 	case 2:
-		gb->video.renderer->disableWIN = !enable;
+		gb->video.renderer->disableOBJ = !enable;
 		break;
 	default:
 		break;