From e9046f8eecc94fdf9218316f6d28d9b43d903f92 Mon Sep 17 00:00:00 2001 From: Techjar Date: Wed, 5 Sep 2018 05:19:17 -0400 Subject: [PATCH] VideoCommon: Skip vsync if configured emulation speed is not 100% It doesn't make much sense to try to vsync at weird framerates, and vsync actually causes the speed setting to not work as expected. --- Source/Core/VideoCommon/VideoConfig.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index a0029df1e7..5fb5d843cc 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -8,6 +8,7 @@ #include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/Config/GraphicsSettings.h" +#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Movie.h" #include "VideoCommon/OnScreenDisplay.h" @@ -174,7 +175,8 @@ void VideoConfig::VerifyValidity() bool VideoConfig::IsVSync() const { - return bVSync && !Core::GetIsThrottlerTempDisabled(); + return bVSync && !Core::GetIsThrottlerTempDisabled() && + SConfig::GetInstance().m_EmulationSpeed == 1.0; } bool VideoConfig::UsingUberShaders() const