projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Split appart visual and layout v offsets
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 31dc8b309221c4721a01e3d881255955cf2ff7e5..5c26371b891f2d856fc04342a435ba3fdd413257 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-81,6
+81,7
@@
DecoderStack::~DecoderStack()
{
if (_decode_thread.joinable()) {
_interrupt = true;
{
if (_decode_thread.joinable()) {
_interrupt = true;
+ _input_cond.notify_one();
_decode_thread.join();
}
}
_decode_thread.join();
}
}
@@
-185,6
+186,7
@@
void DecoderStack::begin_decode()
if (_decode_thread.joinable()) {
_interrupt = true;
if (_decode_thread.joinable()) {
_interrupt = true;
+ _input_cond.notify_one();
_decode_thread.join();
}
_decode_thread.join();
}
@@
-192,7
+194,7
@@
void DecoderStack::begin_decode()
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : _stack)
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : _stack)
- if (!dec->have_required_
probe
s()) {
+ if (!dec->have_required_
channel
s()) {
_error_message = tr("One or more required channels "
"have not been specified");
return;
_error_message = tr("One or more required channels "
"have not been specified");
return;