status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-02-16 12:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cancel video frame processor thread in when destructing QZXingFilterRunnable instead of QZXingFilter as the thread uses the instanse of QZXingFilterRunnable. Solution suggested by @ #176

Browse Source
This commit is contained in:
Nikos Ftylitakis 2020-09-09 12:15:14 +03:00
parent e444138924
commit 14577acc92
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/QZXingFilter.cpp
View File

@ -53,10 +53,6 @@ QZXingFilter::QZXingFilter(QObject *parent)
QZXingFilter::~QZXingFilter() QZXingFilter::~QZXingFilter()
{ {
if(!processThread.isFinished()) {
processThread.cancel();
processThread.waitForFinished();
}
} }
void QZXingFilter::handleDecodingStarted() void QZXingFilter::handleDecodingStarted()
@ -90,6 +86,12 @@ QZXingFilterRunnable::QZXingFilterRunnable(QZXingFilter * filter)
} }
QZXingFilterRunnable::~QZXingFilterRunnable() QZXingFilterRunnable::~QZXingFilterRunnable()
{ {
if(filter != ZXING_NULLPTR && !filter->processThread.isFinished())
{
filter->processThread.cancel();
filter->processThread.waitForFinished();
}
filter = ZXING_NULLPTR; filter = ZXING_NULLPTR;
} }