Resolve conflicts

SpecialKO · Nov 18, 2024 · 9565438 · 9565438
1 parent 21cdec0
commit 9565438
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/framerate.cpp b/src/framerate.cpp
@@ -3403,13 +3403,7 @@ SK::Framerate::Limiter::wait (void)
     static bool   bSync = true; // First time signals resync
     static double dSync = 0.00;
 
-    static int iSkips = 0;
-    static int                       iTry  = 0; // First time signals resync
-    if (                            (iTry == 0 || (rb.gsync_state.active == false || (++iSkips % 50) == 0)) && (
-        config.render.framerate.latent_sync.scanline_resync  != 0 &&
-                                    (iTry++ %
-        config.render.framerate.latent_sync.scanline_resync) == 0 )
-       )
+    if (config.render.framerate.latent_sync.scanline_resync != 0.0f)
     {
       float fResync =
         config.render.framerate.latent_sync.scanline_resync;