From 821f1ed207eb33240ca8330294291ce3492a3029 Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Mon, 27 Nov 2017 12:41:06 -0600
Subject: [PATCH] Revert "Revert "Make SoundSync mutually exclusive with
 DynamicRateControl in GTK+ port. Disable S9xContinueUpdate.""

This reverts commit 7931400b4422772b559a4ad19c7f6eb014a77a61.
---
 gtk/src/gtk_display.cpp | 1 -
 gtk/src/gtk_s9x.cpp     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gtk/src/gtk_display.cpp b/gtk/src/gtk_display.cpp
index ff8add01..be61f93c 100644
--- a/gtk/src/gtk_display.cpp
+++ b/gtk/src/gtk_display.cpp
@@ -1901,7 +1901,6 @@ S9xReinitDisplay (void)
 bool8
 S9xContinueUpdate (int width, int height)
 {
-    S9xDeinitUpdate (width, height);
     return TRUE;
 }
 
diff --git a/gtk/src/gtk_s9x.cpp b/gtk/src/gtk_s9x.cpp
index fea7ddb4..306b2aab 100644
--- a/gtk/src/gtk_s9x.cpp
+++ b/gtk/src/gtk_s9x.cpp
@@ -503,7 +503,7 @@ S9xSyncSpeedFinish (void)
 
     gettimeofday (&now, NULL);
 
-    if (Settings.SoundSync)
+    if (Settings.SoundSync && !Settings.DynamicRateControl)
     {
         while (!S9xSyncSound ())
         {
@@ -611,7 +611,7 @@ S9xSyncSpeed (void)
         ++next_frame_time.tv_usec;
     }
 
-    if (Settings.SkipFrames == AUTO_FRAMERATE && !Settings.SoundSync)
+    if (Settings.SkipFrames == AUTO_FRAMERATE && (!Settings.SoundSync || Settings.DynamicRateControl))
     {
         lag = TIMER_DIFF (now, next_frame_time);
 
@@ -641,7 +641,7 @@ S9xSyncSpeed (void)
     }
     else
     {
-        limit = Settings.SoundSync ? 1 : Settings.SkipFrames + 1;
+        limit = (Settings.SoundSync && !Settings.DynamicRateControl) ? 1 : Settings.SkipFrames + 1;
 
         IPPU.SkippedFrames++;
         IPPU.RenderThisFrame = 0;