diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-05-01 12:40:01 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-05-01 12:40:01 +0200 |
| commit | 557c3db4620f754ab3064599a9ed50f42579bb83 (patch) | |
| tree | 18f1caa849257894cd5489b5a088319fbfd0a19a /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 95f097d79b37fef64752d40e3247da6f7f818932 (diff) | |
| parent | f254fdfd965c0d860e2e457de24fb4aa1b00a957 (diff) | |
Merge pull request #81 from degasus/skip_framelimit_hotkey
Add a hotkey for disabling the framelimit.
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index c12fe9b419..7adecfdebf 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -276,5 +276,5 @@ void VideoConfig::Save(const std::string& ini_file) bool VideoConfig::IsVSync() { - return Core::isTabPressed ? false : bVSync; + return bVSync && !Core::GetIsFramelimiterTempDisabled(); } |