X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=9707d8d2cb605ddf61361bd48c648c4b48d65714;hp=e667693e65dde4ec70bb77bd8fef3c980178807b;hb=6d483b8b51b4efceacf2f48776af33550bf5d29e;hpb=c2d4e9df36b9c19c691ff6fcb57066fd84a652e3

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index e667693e..9707d8d2 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -67,8 +67,10 @@ DecoderStack::DecoderStack(const srd_decoder *const dec) :
 
 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> >&
@@ -168,8 +170,10 @@ void DecoderStack::begin_decode()
 	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();
 
@@ -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)
 	{
-		srd_decoder_inst *const di = dec->create_decoder_inst(session);
+		srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
 
 		if (!di)
 		{