From 0f08abfa1421fa17a9f9bb59c89693e4ae5dd893 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Wed, 11 Jan 2017 12:29:28 -0500
Subject: [PATCH] fix bug in audio samples popped check

---
 libraries/audio-client/src/AudioClient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index a85a6c4282..e0b36891a7 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1658,7 +1658,7 @@ qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) {
     // prepare injectors for the next callback
     QMetaObject::invokeMethod(_audio, "prepareLocalAudioInjectors", Qt::QueuedConnection);
 
-    int samplesPopped = std::max(networkSamplesPopped, networkSamplesPopped);
+    int samplesPopped = std::max(networkSamplesPopped, injectorSamplesPopped);
     int framesPopped = samplesPopped / AudioConstants::STEREO;
     int bytesWritten;
     if (samplesPopped > 0) {