From 3060aa960d9b1467cd2394ddda11fc9af90eb4e9 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 19 Nov 2015 09:23:58 -0800
Subject: [PATCH] Fix the case when local-echo and self-reverb both active

---
 libraries/audio-client/src/AudioClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 9c4349013f..d0f2af37af 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -555,7 +555,7 @@ void AudioClient::configureReverb() {
     _listenerReverb.setParameters(&p);
 
     // used for adding self-reverb to loopback audio
-    p.wetDryMix = _shouldEchoLocally ? 0.0f : 100.0f;   // local echo is 100% dry
+    p.wetDryMix = 100.0f;
     p.preDelay = 0.0f;
     p.earlyGain = -96.0f;   // disable ER
     p.lateGain -= 6.0f;     // quieter than listener reverb
@@ -666,7 +666,7 @@ void AudioClient::handleLocalEchoAndReverb(QByteArray& inputByteArray) {
                        _inputFormat, _outputFormat);
 
     // apply stereo reverb at the source, to the loopback audio
-    if (hasReverb) {
+    if (!_shouldEchoLocally && hasReverb) {
         assert(_outputFormat.channelCount() == 2);
         updateReverbOptions();
         _sourceReverb.render(loopbackSamples, loopbackSamples, numLoopbackSamples/2);