Finish cleanup of predictive vsync.

etternagame · Oct 28, 2016 · bc26e1d · bc26e1d
1 parent a77e8b7
commit bc26e1d
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp
@@ -969,16 +969,16 @@ void RageDisplay::FrameLimitAfterVsync( int iFPS )
 		g_LastFrameEndedAtRage.Touch();
 		return;
 	}
-	else if ( g_fFrameLimit.Get() == 0 && g_fFrameLimitGameplay.Get() == 0 )
+	else if ( !PREFSMAN->m_bVsync.Get() && g_fFrameLimit.Get() == 0 && g_fFrameLimitGameplay.Get() == 0 )
 		return;
 
 	if ( presentFrame )
 	{
-		presentFrame = !g_fPredictiveFrameLimit.Get();
+		presentFrame = false;
 		g_LastFrameEndedAt = std::chrono::high_resolution_clock::now();
 		g_FrameExecutionTime = g_LastFrameEndedAt;
 	}
-	else if(g_fPredictiveFrameLimit.Get())
+	else
 	{
 		// Get the timings for the game logic loop, render loop, and present time
 		// Along with how long we are waiting for, e.g. Frame Limiting
@@ -1017,10 +1017,6 @@ void RageDisplay::FrameLimitAfterVsync( int iFPS )
 			g_FrameRenderTime = std::chrono::high_resolution_clock::now();
 		}
 	}
-	else
-	{
-		presentFrame = true;
-	}
 }
 
 // Both ShouldRenderFrame and ShouldPresentFrame are the same,