X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=e2b6dd7174a0bcdfcadef6ab0041454ab4a2a8c0;hp=7545da3c15030a7090974f1ee65ee4f413c2e44a;hb=86123e2e4711e67f2246998b7172413199f231f4;hpb=2ad82c2e40b6865481733913a2c32735602f63c4

diff --git a/pv/session.cpp b/pv/session.cpp
index 7545da3..e2b6dd7 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,16 +138,21 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	if (device_)
 		device_->close();
 
+	device_.reset();
+
+	// Remove all traces
+	signals_.clear();
+	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();
 }
 
@@ -581,7 +586,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 		if (iter != cur_analog_segments_.end())
 			segment = (*iter).second;
 		else {
-			// If no segment was found, this means we havn't
+			// 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;