From fdbdcb850d13b1ba8e4f94bb1ffb578963aad73b Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 1 Jun 2020 21:16:21 -0700
Subject: [PATCH] 3DS: Fix framelimiter on newer citro3d (fixes #1771)

---
 CHANGES                 | 1 +
 src/platform/3ds/main.c | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index fd8974e77..4cb155e56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Emulation fixes:
  - GBA Video: Simplify sprite cycle counting (fixes mgba.io/i/1279)
  - GBA Video: Add sprite cycle counting to GL (fixes mgba.io/i/1635)
 Other fixes:
+ - 3DS: Fix framelimiter on newer citro3d (fixes mgba.io/i/1771)
  - ARM: Fix disassembling of several S-type instructions (fixes mgba.io/i/1778)
  - ARM Debugger: Clear low bit on breakpoint addresses (fixes mgba.io/i/1764)
  - CMake: Always use devkitPro toolchain when applicable (fixes mgba.io/i/1755)
diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index 9438b6359..25afcd004 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -193,14 +193,13 @@ static void _drawStart(void) {
 		return;
 	}
 	frameStarted = true;
-	u8 flags = 0;
-	if (!frameLimiter) {
+	if (frameLimiter) {
 		if (tickCounter + 4481000 > svcGetSystemTick()) {
-			flags = C3D_FRAME_NONBLOCK;
+			C3D_FrameSync();
 		}
 		tickCounter = svcGetSystemTick();
 	}
-	C3D_FrameBegin(flags);
+	C3D_FrameBegin(0);
 	ctrStartFrame();
 
 	C3D_FrameDrawOn(bottomScreen[doubleBuffer]);