From 87969022204d2e423ba303b459e0cb79a3e38626 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 9 Dec 2014 22:49:27 +0100
Subject: [PATCH] More rigor in thread tear down

---
 src/GAudioOutput.cc          | 6 ++----
 src/audio/QGCAudioWorker.cpp | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index dc847cee7..ca2a4aa95 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -77,10 +77,8 @@ GAudioOutput::~GAudioOutput()
     while (thread->isRunning()) {
         QGC::SLEEP::usleep(100);
     }
-    worker->deleteLater();
-    thread->deleteLater();
-    worker = NULL;
-    thread = NULL;
+    delete worker;
+    delete thread;
 }
 
 
diff --git a/src/audio/QGCAudioWorker.cpp b/src/audio/QGCAudioWorker.cpp
index e0a202f37..5c4c45798 100644
--- a/src/audio/QGCAudioWorker.cpp
+++ b/src/audio/QGCAudioWorker.cpp
@@ -90,6 +90,7 @@ QGCAudioWorker::~QGCAudioWorker()
     pVoice = NULL;
     ::CoUninitialize();
 #endif
+    delete emergencyTimer;
 }
 
 void QGCAudioWorker::say(QString text, int severity)
-- 
2.22.0