ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few fixes for some situations I didn't consider. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4387 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-03-03 19:20:38 +00:00
parent b824ec5610
commit c16cd99dd4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcsx2/gui/AppMain.cpp
View File

@ -437,14 +437,14 @@ void Pcsx2App::LogicalVsync()
FpsManager.DoFrame();
if (EmuConfig.GS.ManagedVsync)
if (EmuConfig.GS.ManagedVsync && EmuConfig.GS.VsyncEnable)
{
static bool last_enabled = true; // Avoids locking it in some scenarios
static int too_slow = 0;
static int fast_enough = 0;
if ( g_LimiterMode == Limit_Nominal && EmuConfig.GS.VsyncEnable && g_Conf->EmuOptions.GS.FrameLimitEnable )
{
static bool last_enabled = 0;
static int too_slow = 0;
static int fast_enough = 0;
float fps = (float)FpsManager.GetFramerate();
if( gsRegionMode == Region_NTSC )
@ -491,7 +491,12 @@ void Pcsx2App::LogicalVsync()
}
}
else
{
last_enabled = true; // Avoids locking it in some scenarios
too_slow = 0;
fast_enough = 0;
GSsetVsync( 0 );
}
}
// Only call PADupdate here if we're using GSopen2. Legacy GSopen plugins have the
// GS window belonging to the MTGS thread.