Commit d879a932 authored by Benno Eigenmann's avatar Benno Eigenmann

Ubuntu 15.04: thread->wait() hangs on Program Exit in GAudioOutput destructor

parent 3fd16aaa
...@@ -56,16 +56,14 @@ GAudioOutput::GAudioOutput(QObject *parent) : ...@@ -56,16 +56,14 @@ GAudioOutput::GAudioOutput(QObject *parent) :
worker->moveToThread(thread); worker->moveToThread(thread);
connect(this, &GAudioOutput::textToSpeak, worker, &QGCAudioWorker::say); connect(this, &GAudioOutput::textToSpeak, worker, &QGCAudioWorker::say);
connect(this, &GAudioOutput::beepOnce, worker, &QGCAudioWorker::beep); connect(this, &GAudioOutput::beepOnce, worker, &QGCAudioWorker::beep);
connect(thread, &QThread::finished, thread, &QObject::deleteLater);
connect(thread, &QThread::finished, worker, &QObject::deleteLater);
thread->start(); thread->start();
} }
GAudioOutput::~GAudioOutput() GAudioOutput::~GAudioOutput()
{ {
thread->quit(); thread->quit();
thread->wait();
delete worker;
delete thread;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment