From 1a4ed6fe5e3c35d2fb8d6df95ec2dcb80ee53b96 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 7 Jun 2015 15:18:10 -0700
Subject: [PATCH] Qt: Reshuffle some audio handling code

---
 src/platform/qt/GameController.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 0adf18c01..fed36345c 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -521,7 +521,6 @@ void GameController::setFPSTarget(float fps) {
 	}
 	redoSamples(m_audioProcessor->getBufferSamples());
 	threadContinue();
-	QMetaObject::invokeMethod(m_audioProcessor, "inputParametersChanged");
 }
 
 void GameController::setSkipBIOS(bool set) {
@@ -622,16 +621,16 @@ void GameController::enableTurbo() {
 		m_threadContext.fpsTarget = m_fpsTarget;
 		m_threadContext.sync.audioWait = m_audioSync;
 		m_threadContext.sync.videoFrameWait = m_videoSync;
-		redoSamples(m_audioProcessor->getBufferSamples());
 	} else if (m_turboSpeed <= 0) {
+		m_threadContext.fpsTarget = m_fpsTarget;
 		m_threadContext.sync.audioWait = false;
 		m_threadContext.sync.videoFrameWait = false;
 	} else {
 		m_threadContext.fpsTarget = m_fpsTarget * m_turboSpeed;
 		m_threadContext.sync.audioWait = true;
 		m_threadContext.sync.videoFrameWait = false;
-		redoSamples(m_audioProcessor->getBufferSamples());
 	}
+	redoSamples(m_audioProcessor->getBufferSamples());
 	threadContinue();
 }
 
@@ -734,6 +733,7 @@ void GameController::redoSamples(int samples) {
 	if (m_threadContext.gba) {
 		GBAAudioResizeBuffer(&m_threadContext.gba->audio, m_threadContext.audioBuffers);
 	}
+	QMetaObject::invokeMethod(m_audioProcessor, "inputParametersChanged");
 }
 
 void GameController::setLogLevel(int levels) {