From 8f616c04fb08154b6b4f4dee5a78131c57e75cd8 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Sun, 2 Aug 2015 21:46:39 -0700
Subject: [PATCH] Fix https://app.asana.com/0/32622044445063/43589567731045

---
 libraries/audio-client/src/AudioClient.cpp | 17 ++++++++---------
 libraries/audio-client/src/AudioClient.h   |  3 ---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 908310d504..a3d3a72043 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1037,9 +1037,14 @@ bool AudioClient::outputLocalInjector(bool isStereo, AudioInjector* injector) {
         localOutput->moveToThread(injector->getLocalBuffer()->thread());
 
         // have it be stopped when that local buffer is about to close
-        connect(localOutput, &QAudioOutput::stateChanged, this, &AudioClient::audioStateChanged);
-        connect(this, &AudioClient::audioFinished, localOutput, &QAudioOutput::stop);
-        connect(this, &AudioClient::audioFinished, injector, &AudioInjector::stop);
+        // We don't want to stop this localOutput and injector whenever this AudioClient singleton goes idle,
+        // only when the localOutput does. But the connection is to localOutput, so that it happens on the right thread.
+        connect(localOutput, &QAudioOutput::stateChanged, localOutput, [=](QAudio::State state) {
+            if (state == QAudio::IdleState) {
+                localOutput->stop();
+                injector->stop();
+            }
+        });
 
         connect(injector->getLocalBuffer(), &QIODevice::aboutToClose, localOutput, &QAudioOutput::stop);
 
@@ -1358,9 +1363,3 @@ void AudioClient::saveSettings() {
     windowSecondsForDesiredReduction.set(_receivedAudioStream.getWindowSecondsForDesiredReduction());
     repetitionWithFade.set(_receivedAudioStream.getRepetitionWithFade());
 }
-
-void AudioClient::audioStateChanged(QAudio::State state) {
-    if (state == QAudio::IdleState) {
-        emit audioFinished();
-    }
-}
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index a1d08ec540..3205aeda1d 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -209,9 +209,6 @@ protected:
         deleteLater();
     }
 
-private slots:
-    void audioStateChanged(QAudio::State state);
-
 private:
     void outputFormatChanged();