X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=aab5be7d23bcb5b4ba2ed85d777cb40c5f80c2f7;hp=4469a3eef367071c44a545d3c3a1a8ae746742cc;hb=85843b14c48affe67820ec8c9e357cd26e0ed943;hpb=921b90c0b3ae0cf44247da3d87bd7dc0612e9681

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 4469a3e..aab5be7 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -73,13 +73,16 @@ SigSession::SigSession(DeviceManager &device_manager) :
 
 SigSession::~SigSession()
 {
+	using pv::device::Device;
+
 	stop_capture();
 
 	if (_sampling_thread.joinable())
 		_sampling_thread.join();
 
-	if (_dev_inst)
-		_device_manager.release_device(_dev_inst);
+	shared_ptr<Device> device(dynamic_pointer_cast<Device>(_dev_inst));
+	if (device)
+		_device_manager.release_device(device);
 
 	// TODO: This should not be necessary
 	_session = NULL;
@@ -92,13 +95,19 @@ shared_ptr<device::DevInst> SigSession::get_device() const
 
 void SigSession::set_device(shared_ptr<device::DevInst> dev_inst)
 {
+	using pv::device::Device;
+
 	// Ensure we are not capturing before setting the device
 	stop_capture();
 
-	if (_dev_inst)
-		_device_manager.release_device(_dev_inst);
-	if (dev_inst)
-		_device_manager.use_device(dev_inst, this);
+	shared_ptr<Device> old_device(dynamic_pointer_cast<Device>(_dev_inst));
+	if (old_device)
+		_device_manager.release_device(old_device);
+
+	shared_ptr<Device> new_device(dynamic_pointer_cast<Device>(dev_inst));
+	if (new_device)
+		_device_manager.use_device(new_device, this);
+
 	_dev_inst = dev_inst;
 	update_signals(dev_inst);
 }