From 2f68ea1b48da14a1a0be06e84fd9a898d93bcdfd Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 13 Jan 2020 18:01:59 -0800
Subject: [PATCH] Wii: Fix game fast-forwarding after slowing down

---
 CHANGES                 | 1 +
 src/platform/wii/main.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 223b90ad1..fa6b16d6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -112,6 +112,7 @@ Other fixes:
  - Qt: Fix inability to clear default keybindings
  - Qt: Release held actions if they get rebound
  - Vita: Fix analog controls (fixes mgba.io/i/1554)
+ - Wii: Fix game fast-forwarding after slowing down
 Misc:
  - GB Memory: Support manual SRAM editing (fixes mgba.io/i/1580)
  - GBA Audio: Redo channel 4 batching for GBA only
diff --git a/src/platform/wii/main.c b/src/platform/wii/main.c
index 20cd2445b..d06a39e61 100644
--- a/src/platform/wii/main.c
+++ b/src/platform/wii/main.c
@@ -648,6 +648,8 @@ static void _drawStart(void) {
 			VIDEO_WaitVSync();
 		}
 		referenceRetraceCount = retraceCount;
+	} else if (frameLimiter && referenceRetraceCount < retraceCount - 1) {
+		referenceRetraceCount = retraceCount - 1;
 	}
 	_CPU_ISR_Restore(level);