From e18c10e5e15fb7e7f8ae18699bc49a737916afd4 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 15 Aug 2015 15:31:24 -0700
Subject: [PATCH] Qt: Set default sample rate

---
 src/platform/qt/ConfigController.cpp | 1 +
 src/platform/qt/GameController.cpp   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 021908680..2a0ae0184 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -108,6 +108,7 @@ ConfigController::ConfigController(QObject* parent)
 	m_opts.videoSync = GameController::VIDEO_SYNC;
 	m_opts.fpsTarget = 60;
 	m_opts.audioBuffers = 1536;
+	m_opts.sampleRate = 44100;
 	m_opts.volume = GBA_AUDIO_VOLUME_MAX;
 	m_opts.logLevel = GBA_LOG_WARN | GBA_LOG_ERROR | GBA_LOG_FATAL | GBA_LOG_STATUS;
 	m_opts.rewindEnable = false;
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 57216ddb3..b64d89193 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -599,6 +599,9 @@ void GameController::setAudioBufferSamples(int samples) {
 }
 
 void GameController::setAudioSampleRate(unsigned rate) {
+	if (!rate) {
+		return;
+	}
 	if (m_audioProcessor) {
 		threadInterrupt();
 		redoSamples(m_audioProcessor->getBufferSamples());