Don't join with non-threads. Fixes 323

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index e667693e65dde4ec70bb77bd8fef3c980178807b..9707d8d2cb605ddf61361bd48c648c4b48d65714 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -67,8 +67,10 @@ DecoderStack::DecoderStack(const srd_decoder *const dec) :
 
 DecoderStack::~DecoderStack()
 {
 
 DecoderStack::~DecoderStack()
 {

-       _decode_thread.interrupt();
-       _decode_thread.join();
+       if (_decode_thread.joinable()) {
+               _decode_thread.interrupt();
+               _decode_thread.join();
+       }

 }
 
 const std::list< boost::shared_ptr<decode::Decoder> >&
 }
 
 const std::list< boost::shared_ptr<decode::Decoder> >&


@@ -168,8 +170,10 @@ void DecoderStack::begin_decode()
        shared_ptr<pv::view::LogicSignal> logic_signal;
        shared_ptr<pv::data::Logic> data;
 
        shared_ptr<pv::view::LogicSignal> logic_signal;
        shared_ptr<pv::data::Logic> data;
 

-       _decode_thread.interrupt();
-       _decode_thread.join();
+       if (_decode_thread.joinable()) {
+               _decode_thread.interrupt();
+               _decode_thread.join();
+       }

 
        clear();
 
 
        clear();
 


@@ -271,7 +275,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
        // Create the decoders
        BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
        {
        // Create the decoders
        BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
        {

-               srd_decoder_inst *const di = dec->create_decoder_inst(session);
+               srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);

 
                if (!di)
                {
 
                if (!di)
                {