X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=4bc510e9fa538d5eb3a848fde39ea4604520512d;hp=0ac5bb7286dbe2cd6c76dbd07ca967ec2d289176;hb=d60820d865b8044aa6447a49861eac0dd0a6a4d4;hpb=a3f678a7cad210fe796f4a76370996a1284da6d4

diff --git a/pv/session.cpp b/pv/session.cpp
index 0ac5bb72..4bc510e9 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,16 +138,30 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	if (device_)
 		device_->close();
 
+	device_.reset();
+
+	// Remove all traces
+	signals_.clear();
+	cur_logic_segment_.reset();
+
+	for (auto entry : cur_analog_segments_) {
+		shared_ptr<sigrok::Channel>(entry.first).reset();
+		shared_ptr<data::AnalogSegment>(entry.second).reset();
+	}
+
+	logic_data_.reset();
+	decode_traces_.clear();
+
+	signals_changed();
+
 	device_ = std::move(device);
 	device_->open();
 	device_->session()->add_datafeed_callback([=]
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
-	update_signals();
-
-	decode_traces_.clear();
 
+	update_signals();
 	device_selected();
 }
 
@@ -253,8 +267,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 	map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
-	try
-	{
+	try {
 		lock_guard<boost::shared_mutex> lock(signals_mutex_);
 
 		// Create the decoder
@@ -270,8 +283,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
-			for (shared_ptr<view::Signal> s : signals_)
-			{
+			for (shared_ptr<view::Signal> s : signals_) {
 				shared_ptr<view::LogicSignal> l =
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
@@ -290,9 +302,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 			new view::DecodeTrace(*this, decoder_stack,
 				decode_traces_.size()));
 		decode_traces_.push_back(d);
-	}
-	catch(std::runtime_error e)
-	{
+	} catch (std::runtime_error e) {
 		return false;
 	}
 
@@ -313,8 +323,7 @@ vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
 void Session::remove_decode_signal(view::DecodeTrace *signal)
 {
 	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-		if ((*i).get() == signal)
-		{
+		if ((*i).get() == signal) {
 			decode_traces_.erase(i);
 			signals_changed();
 			return;
@@ -338,7 +347,11 @@ void Session::set_capture_state(capture_state state)
 
 void Session::update_signals()
 {
-	assert(device_);
+	if (!device_) {
+		signals_.clear();
+		logic_data_.reset();
+		return;
+	}
 
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
@@ -454,7 +467,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
 	try {
 		device_->start();
-	} catch(Error e) {
+	} catch (Error e) {
 		error_handler(e.what());
 		return;
 	}
@@ -466,8 +479,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
-	if (cur_logic_segment_)
-	{
+	if (cur_logic_segment_) {
 		qDebug("SR_DF_END was not received.");
 		assert(0);
 	}
@@ -535,16 +547,14 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 	const size_t sample_count = logic->data_length() / logic->unit_size();
 
-	if (!logic_data_)
-	{
+	if (!logic_data_) {
 		// The only reason logic_data_ would not have been created is
 		// if it was not possible to determine the signals when the
 		// device was created.
 		update_signals();
 	}
 
-	if (!cur_logic_segment_)
-	{
+	if (!cur_logic_segment_) {
 		// This could be the first packet after a trigger
 		set_capture_state(Running);
 
@@ -559,9 +569,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		// frame_began is DecoderStack, but in future we need to signal
 		// this after both analog and logic sweeps have begun.
 		frame_began();
-	}
-	else
-	{
+	} else {
 		// Append to the existing data segment
 		cur_logic_segment_->append_payload(logic);
 	}
@@ -579,12 +587,10 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
-	if (signals_.empty()) {
+	if (signals_.empty())
 		update_signals();
-	}
 
-	for (auto channel : channels)
-	{
+	for (auto channel : channels) {
 		shared_ptr<data::AnalogSegment> segment;
 
 		// Try to get the segment of the channel
@@ -592,9 +598,8 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			iterator iter = cur_analog_segments_.find(channel);
 		if (iter != cur_analog_segments_.end())
 			segment = (*iter).second;
-		else
-		{
-			// If no segment was found, this means we havn't
+		else {
+			// If no segment was found, this means we haven't
 			// created one yet. i.e. this is the first packet
 			// in the sweep containing this segment.
 			sweep_beginning = true;