comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-31 20:27:49 -04:00
Code Issues Projects Releases Wiki Activity

Fix demodulator worker thread crash on terminate

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-24 07:25:04 -04:00
parent c30cce9114
commit fe46fb191f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/demod/DemodulatorPreThread.cpp
View File

@ -72,9 +72,6 @@ void DemodulatorPreThread::initialize() {
} }
DemodulatorPreThread::~DemodulatorPreThread() { DemodulatorPreThread::~DemodulatorPreThread() {
delete workerThread;
delete workerQueue;
delete workerResults;
} }
void DemodulatorPreThread::run() { void DemodulatorPreThread::run() {
@ -260,7 +257,7 @@ void DemodulatorPreThread::run() {
inp->decRefCount(); inp->decRefCount();
if (!workerResults->empty()) { if (!terminated && !workerResults->empty()) {
while (!workerResults->empty()) { while (!workerResults->empty()) {
DemodulatorWorkerThreadResult result; DemodulatorWorkerThreadResult result;
workerResults->pop(result); workerResults->pop(result);
@ -323,7 +320,12 @@ void DemodulatorPreThread::terminate() {
terminated = true; terminated = true;
DemodulatorThreadIQData *inp = new DemodulatorThreadIQData; // push dummy to nudge queue DemodulatorThreadIQData *inp = new DemodulatorThreadIQData; // push dummy to nudge queue
iqInputQueue->push(inp); iqInputQueue->push(inp);
DemodulatorWorkerThreadCommand command(DemodulatorWorkerThreadCommand::DEMOD_WORKER_THREAD_CMD_NULL);
workerQueue->push(command);
workerThread->terminate(); workerThread->terminate();
t_Worker->detach(); t_Worker->join();
delete t_Worker; delete t_Worker;
delete workerThread;
delete workerResults;
delete workerQueue;
} }