Merge pull request #18113 from hrydgard/fastforward-fix

Have unthrottle override alternate speeds, like before.
hrydgard · Sep 9, 2023 · 383ade0 · 383ade0
2 parents ee6742c + a820b29
commit 383ade0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
@@ -362,16 +362,16 @@ 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);
 	if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM2)
 		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;
 }