More rigor in thread tear down

87969022 · Lorenz Meier · 4abafb46 · 87969022 · 87969022
Commit 87969022 authored Dec 09, 2014 by Lorenz Meier
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

GAudioOutput.cc src/GAudioOutput.cc +2 -4

QGCAudioWorker.cpp src/audio/QGCAudioWorker.cpp +1 -0

No files found.
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -77,10 +77,8 @@ GAudioOutput::~GAudioOutput()
    while (thread->isRunning()) {
        QGC::SLEEP::usleep(100);
    }
-    worker->deleteLater();
+    delete worker;
-    thread->deleteLater();
+    delete thread;
-    worker = NULL;
-    thread = NULL;
 }

--- 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)