X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.cpp;h=a0fc10e6f5a36de217cc2008cb1201e2f6bf0a02;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=723542b9fd9d3c6f874e4494004ee1b64eb383f1;hpb=3084ed4b15663dd717ff656745db305f377ab215;p=pulseview.git

diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index 723542b..a0fc10e 100644
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.cpp
@@ -72,8 +72,8 @@ void DeviceToolButton::set_device_list(
 	const list< shared_ptr<Device> > &devices, shared_ptr<Device> selected)
 {
 	selected_device_ = selected;
-	setText(QString::fromStdString(
-		selected->display_name(device_manager_)));
+	setText(selected ? QString::fromStdString(
+		selected->display_name(device_manager_)) : "<No Device>");
 	devices_ = vector< weak_ptr<Device> >(devices.begin(), devices.end());
 	update_device_list();
 }
@@ -86,7 +86,7 @@ void DeviceToolButton::update_device_list()
 	menu_.addSeparator();
 
 	for (weak_ptr<Device> dev_weak_ptr : devices_) {
-		shared_ptr<Device> dev(dev_weak_ptr);
+		shared_ptr<Device> dev(dev_weak_ptr.lock());
 		if (!dev)
 			continue;