diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-08-06 16:27:55 +0200 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-11-01 17:02:44 +0100 |
| commit | 77335b300a45645e8c01bb3c167877070f7a3f29 (patch) | |
| tree | b70fcab58d4288a3e075de08465e9e7cc88c9240 /src/QR-Code-scanner/QrScanThread.cpp | |
| parent | 6f95f8a7545bbdc25750412c54a92ddc5224b3ad (diff) | |
| download | monzero-gui-77335b300a45645e8c01bb3c167877070f7a3f29.tar.gz monzero-gui-77335b300a45645e8c01bb3c167877070f7a3f29.tar.xz monzero-gui-77335b300a45645e8c01bb3c167877070f7a3f29.zip | |
QrCodeScanner: parse extra parameters
Diffstat (limited to 'src/QR-Code-scanner/QrScanThread.cpp')
| -rw-r--r-- | src/QR-Code-scanner/QrScanThread.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/QR-Code-scanner/QrScanThread.cpp b/src/QR-Code-scanner/QrScanThread.cpp index b6e9b9ff..48ecb53a 100644 --- a/src/QR-Code-scanner/QrScanThread.cpp +++ b/src/QR-Code-scanner/QrScanThread.cpp @@ -110,6 +110,7 @@ void QrScanThread::processVideoFrame(const QVideoFrame &frame) void QrScanThread::stop() { m_running = false; + m_waitCondition.wakeOne(); } void QrScanThread::addFrame(const QVideoFrame &frame) @@ -124,9 +125,10 @@ void QrScanThread::run() QVideoFrame frame; while(m_running) { QMutexLocker locker(&m_mutex); - while(m_queue.isEmpty()) + while(m_queue.isEmpty() && m_running) m_waitCondition.wait(&m_mutex); - processVideoFrame(m_queue.takeFirst()); + if(!m_queue.isEmpty()) + processVideoFrame(m_queue.takeFirst()); } } |