Fix #805 by resetting selected device on failure

[pulseview.git] / pv / widgets / devicetoolbutton.cpp

diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index 723542b9fd9d3c6f874e4494004ee1b64eb383f1..d553aba32987d7bded07a7be5767d63501fb69c0 100644 (file)
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.cpp
@@ -72,12 +72,19 @@ 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_)) : tr("<No Device>"));
        devices_ = vector< weak_ptr<Device> >(devices.begin(), devices.end());
        update_device_list();
 }
 
+void DeviceToolButton::reset()
+{
+       setText(tr("<No Device>"));
+       selected_device_.reset();
+       update_device_list();
+}
+
 void DeviceToolButton::update_device_list()
 {
        menu_.clear();
@@ -86,7 +93,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;
 
@@ -108,6 +115,8 @@ void DeviceToolButton::on_action(QObject *action)
 {
        assert(action);
 
+       selected_device_.reset();
+
        Device *const dev = (Device*)((QAction*)action)->data().value<void*>();
        for (weak_ptr<Device> dev_weak_ptr : devices_) {
                shared_ptr<Device> dev_ptr(dev_weak_ptr);