pcsx2: Fix inconsistent framelimiter/vsync interaction

If emulation is paused and resumed, vsync may become enabled even if the
frame limiter is currently disabled. This state persists until the
settings are changed or the hotkeys are used.

Fix the inconsistent framelimiter/vsync behaviour so that vsync isn't
enabled whenever the framelimiter is disabled, which matches the
behaviour in the rest of the code.
This commit is contained in:
Jonathan Li committed 2017-08-30 21:08:54 +01:00
1 parent c02a545c7d
commit 056cbbcdcd
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -237,7 +237,7 @@ void Pcsx2Config::GSOptions::LoadSave( IniInterface& ini )
int Pcsx2Config::GSOptions::GetVsync() const
{
if (g_LimiterMode == Limit_Turbo)
if (g_LimiterMode == Limit_Turbo || !FrameLimitEnable)
return 0;
// D3D only support a boolean state. OpenGL waits a number of vsync
+1 -1
View File
@@ -512,7 +512,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src )
}
if (m_ExecMode >= ExecMode_Paused)
GSsetVsync(EmuConfig.GS.FrameLimitEnable ? EmuConfig.GS.GetVsync() : 0);
GSsetVsync(EmuConfig.GS.GetVsync());
}
// --------------------------------------------------------------------------------------