From 557ab43f0fe8e91fc1850c8285a076801d94152a Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Tue, 6 Dec 2016 23:53:16 +0000
Subject: [PATCH] add a timeout for errant audio slave threads

---
 assignment-client/src/audio/AudioMixerSlavePool.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixerSlavePool.cpp b/assignment-client/src/audio/AudioMixerSlavePool.cpp
index 1a4ee78e54..8d3ad19e40 100644
--- a/assignment-client/src/audio/AudioMixerSlavePool.cpp
+++ b/assignment-client/src/audio/AudioMixerSlavePool.cpp
@@ -176,7 +176,8 @@ void AudioMixerSlavePool::resize(int numThreads) {
         slave = extraBegin;
         while (slave != _slaves.end()) {
             QThread* thread = reinterpret_cast<QThread*>(slave->get());
-            thread->wait();
+            static const int MAX_THREAD_WAIT_TIME = 10;
+            thread->wait(MAX_THREAD_WAIT_TIME);
             ++slave;
         }