Fix #605 by closing current device when another is selected

[pulseview.git] / pv / devices / hardwaredevice.cpp

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index 6374dafe6e03aaddb219a05c1fa4c3a21ab71dd5..d1161aa26669a614bc36fc52e4871bdc1fb68496 100644 (file)
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -43,14 +43,13 @@ namespace devices {
 
 HardwareDevice::HardwareDevice(const std::shared_ptr<sigrok::Context> &context,
        std::shared_ptr<sigrok::HardwareDevice> device) :
-       context_(context) {
+       context_(context),
+       device_open_(false) {
        device_ = device;
 }
 
 HardwareDevice::~HardwareDevice() {
-       device_->close();
-       if (session_)
-               session_->remove_devices();
+       close();
 }
 
 string HardwareDevice::full_name() const {
@@ -96,17 +95,31 @@ string HardwareDevice::display_name(
        return join(parts, " ");
 }
 
-void HardwareDevice::create() {
-       // Open the device
-        try {
-                device_->open();
-        } catch(const sigrok::Error &e) {
-                throw QString(e.what());
-        }
-
-        // Set up the session
-        session_ = context_->create_session();
-        session_->add_device(device_);
+void HardwareDevice::open() {
+       if (device_open_)
+               close();
+
+       try {
+               device_->open();
+       } catch(const sigrok::Error &e) {
+               throw QString(e.what());
+       }
+
+       device_open_ = true;
+
+       // Set up the session
+       session_ = context_->create_session();
+       session_->add_device(device_);
+}
+
+void HardwareDevice::close() {
+       if (device_open_)
+               device_->close();
+
+       if (session_)
+               session_->remove_devices();
+
+       device_open_ = false;
 }
 
 } // namespace devices