From e32025579dc2ac0bbb78f87ef241c4b4c5f8fc9c Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Sun, 4 Feb 2018 16:52:55 +0100
Subject: [PATCH] DecodeSignal: Re-create SRD session when changes are pending

---
 pv/data/decodesignal.cpp | 20 ++++++++++++++------
 pv/data/decodesignal.hpp |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index df385be..95ea45a 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -56,6 +56,7 @@ DecodeSignal::DecodeSignal(pv::Session &session) :
 	session_(session),
 	srd_session_(nullptr),
 	logic_mux_data_invalid_(false),
+	stack_config_changed_(true),
 	current_segment_id_(0)
 {
 	connect(&session_, SIGNAL(capture_state_changed(int)),
@@ -86,6 +87,7 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 	// Include the newly created decode channels in the channel lists
 	update_channel_list();
 
+	stack_config_changed_ = true;
 	auto_assign_signals(dec);
 	commit_decoder_channels();
 	begin_decode();
@@ -105,6 +107,7 @@ void DecodeSignal::remove_decoder(int index)
 	stack_.erase(iter);
 
 	// Update channels and decoded data
+	stack_config_changed_ = true;
 	update_channel_list();
 	begin_decode();
 }
@@ -129,7 +132,10 @@ bool DecodeSignal::toggle_decoder_visibility(int index)
 
 void DecodeSignal::reset_decode()
 {
-	terminate_srd_session();
+	if (stack_config_changed_)
+		stop_srd_session();
+	else
+		terminate_srd_session();
 
 	if (decode_thread_.joinable()) {
 		decode_interrupt_ = true;
@@ -143,8 +149,6 @@ void DecodeSignal::reset_decode()
 		logic_mux_thread_.join();
 	}
 
-	stop_srd_session();
-
 	class_rows_.clear();
 	current_segment_id_ = 0;
 	segments_.clear();
@@ -159,8 +163,6 @@ void DecodeSignal::reset_decode()
 
 void DecodeSignal::begin_decode()
 {
-	terminate_srd_session();
-
 	if (decode_thread_.joinable()) {
 		decode_interrupt_ = true;
 		decode_input_cond_.notify_one();
@@ -287,6 +289,7 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 
 	if (new_assignment) {
 		logic_mux_data_invalid_ = true;
+		stack_config_changed_ = true;
 		commit_decoder_channels();
 		channels_updated();
 	}
@@ -300,6 +303,7 @@ void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *si
 			logic_mux_data_invalid_ = true;
 		}
 
+	stack_config_changed_ = true;
 	commit_decoder_channels();
 	channels_updated();
 	begin_decode();
@@ -318,8 +322,8 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in
 		if (ch.id == channel_id)
 			ch.initial_pin_state = init_state;
 
+	stack_config_changed_ = true;
 	channels_updated();
-
 	begin_decode();
 }
 
@@ -571,6 +575,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
 	}
 
 	// Update the internal structures
+	stack_config_changed_ = true;
 	update_channel_list();
 	commit_decoder_channels();
 
@@ -1039,6 +1044,9 @@ void DecodeSignal::start_srd_session()
 		DecodeSignal::annotation_callback, this);
 
 	srd_session_start(srd_session_);
+
+	// We just recreated the srd session, so all stack changes are applied now
+	stack_config_changed_ = false;
 }
 
 void DecodeSignal::terminate_srd_session()
diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 4f2253d..1455274 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -187,6 +187,7 @@ private:
 	bool logic_mux_data_invalid_;
 
 	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
 	vector<DecodeSegment> segments_;
-- 
2.30.2