diff options
| author | JosJuice <josjuice@gmail.com> | 2019-01-31 22:44:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 22:44:10 +0100 |
| commit | c1492aeb45e471cd37cd562f3fc87c27ab0fcd4c (patch) | |
| tree | 5f46fc0539042a0b59323de07c7e944e1cf4f006 /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 9c38772301101c4cd0f2a7912c9314ce6492cb62 (diff) | |
| parent | b01df8670fd9cf0571230ca7f0e19611e71256dd (diff) | |
Merge pull request #7744 from stenzek/vsync
Renderer: Fix throttle-disable (TAB) hotkey when vsync is enabled
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index cc14b191fd..6520cbe7bc 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -19,11 +19,19 @@ VideoConfig g_Config; VideoConfig g_ActiveConfig; static bool s_has_registered_callback = false; +static bool IsVSyncActive(bool enabled) +{ + // Vsync is disabled when the throttler is disabled by the tab key. + return enabled && !Core::GetIsThrottlerTempDisabled() && + SConfig::GetInstance().m_EmulationSpeed == 1.0; +} + void UpdateActiveConfig() { if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) Movie::SetGraphicsConfig(); g_ActiveConfig = g_Config; + g_ActiveConfig.bVSyncActive = IsVSyncActive(g_ActiveConfig.bVSync); } VideoConfig::VideoConfig() @@ -175,12 +183,6 @@ void VideoConfig::VerifyValidity() } } -bool VideoConfig::IsVSync() const -{ - return bVSync && !Core::GetIsThrottlerTempDisabled() && - SConfig::GetInstance().m_EmulationSpeed == 1.0; -} - bool VideoConfig::UsingUberShaders() const { return iShaderCompilationMode == ShaderCompilationMode::SynchronousUberShaders || |