From a820b299aeab43f0871d07ae6baf4f74197eb5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 9 Sep 2023 13:38:46 +0200
Subject: [PATCH] Have unthrottle override alternate speeds, like before.

---
 Core/HLE/sceDisplay.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 8053e71bd0..545293338a 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -362,6 +362,9 @@ static int FrameTimingLimit() {
 		}
 	};
 
+	// Note: Fast-forward is OK in challenge mode.
+	if (PSP_CoreParameter().fastForward)
+		return 0;
 	// Can't slow down in challenge mode.
 	if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM1)
 		return fixRate(g_Config.iFpsLimit1);
@@ -369,9 +372,6 @@ static int FrameTimingLimit() {
 		return fixRate(g_Config.iFpsLimit2);
 	if (PSP_CoreParameter().fpsLimit == FPSLimit::ANALOG)
 		return fixRate(PSP_CoreParameter().analogFpsLimit);
-	// Note: Fast-forward is OK in challenge mode.
-	if (PSP_CoreParameter().fastForward)
-		return 0;
 	return framerate;
 }