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

diff --git a/pv/session.cpp b/pv/session.cpp
index 9fd8fb3..e2b6dd7 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,6 +138,13 @@ 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([=]
@@ -145,8 +152,6 @@ void Session::set_device(shared_ptr<devices::Device> device)
 			data_feed_in(device, packet);
 		});
 
-	decode_traces_.clear();
-
 	update_signals();
 	device_selected();
 }