From: Joel Holdsworth <redacted>
Date: Sun, 12 Apr 2015 15:10:05 +0000 (+0100)
Subject: DeviceToolButton: Support having no selected device
X-Git-Tag: pulseview-0.3.0~195
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=2a53532cca7d8ac0b6e61413a9f69580f9f8c941;hp=9dd888899b1318787ffae6db62f4948b9aee2b84

DeviceToolButton: Support having no selected device
---

diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index 723542b9..a0fc10e6 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;