diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-09-16 15:19:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-16 15:19:45 +0200 |
| commit | c49eb2d24975dcbbdb916e19bdb9c01068936884 (patch) | |
| tree | e9389e1a9302e52574da21e44265bb616c662412 /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 80c402e1adb0b7e28d82d7736d9bc584de45b47f (diff) | |
| parent | e9046f8eecc94fdf9218316f6d28d9b43d903f92 (diff) | |
Merge pull request #7398 from Techjar/emu-speed-skip-vsync
VideoCommon: Skip vsync if configured emulation speed is not 100%
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |