X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;fp=pv%2Fdata%2Fdecodesignal.cpp;h=cd1d5ff301ea1d7d88f8498b6eb74a438211baa8;hp=8d606d43dd9b87c9b4ce5b9c7eda5426d4a4f61a;hb=8b24af15d583c1df24b49f9709ff9156a9faa16e;hpb=09ab7056e772e3b85889eb1c508597b3cc7bfbe4 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 8d606d43..cd1d5ff3 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -141,6 +141,8 @@ bool DecodeSignal::toggle_decoder_visibility(int index) void DecodeSignal::reset_decode(bool shutting_down) { + resume_decode(); // Make sure the decode thread isn't blocked by pausing + if (stack_config_changed_ || shutting_down) stop_srd_session(); else @@ -158,8 +160,6 @@ void DecodeSignal::reset_decode(bool shutting_down) logic_mux_thread_.join(); } - resume_decode(); // Make sure the decode thread isn't blocked by pausing - current_segment_id_ = 0; segments_.clear();