From 2235dcf2ab8b848ea80815a93af97a84835c3b61 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 21 Feb 2015 01:59:33 -0800
Subject: [PATCH] Qt: Fix crash when adjusting settings after closing a game

---
 CHANGES                         | 1 +
 src/platform/qt/AudioDevice.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0dda282e8..2845ad018 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ Bugfixes:
  - GBA Thread: Fix possible deadlock in video sync
  - GBA: Fix savestate loading of DISPSTAT and WAITCNT registers
  - Qt: Fix crash starting a GDB stub if a game isn't loaded
+ - Qt: Fix crash when adjusting settings after closing a game
 Misc:
  - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples
  - GBA Memory: Simplify memory API and use fixed bus width
diff --git a/src/platform/qt/AudioDevice.cpp b/src/platform/qt/AudioDevice.cpp
index d02212d1b..980d1f380 100644
--- a/src/platform/qt/AudioDevice.cpp
+++ b/src/platform/qt/AudioDevice.cpp
@@ -22,7 +22,7 @@ AudioDevice::AudioDevice(QObject* parent)
 }
 
 void AudioDevice::setFormat(const QAudioFormat& format) {
-	if (!GBAThreadHasStarted(m_context)) {
+	if (!GBAThreadIsActive(m_context)) {
 		return;
 	}
 #if RESAMPLE_LIBRARY == RESAMPLE_NN