diff options
author | RJ Ryan <rryan@mixxx.org> | 2015-12-19 20:33:51 -0500 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2015-12-19 20:46:06 -0500 |
commit | 063a85601a2f24b3e1aa16b35ebd4dc2fbe93fd5 (patch) | |
tree | 3d091ccd52d39fc69ff7cf31cdb09441d42982df | |
parent | 469a37f11239b8c700fac98ad5d78d0299f934c2 (diff) |
Don't close devices that are already closed.
-rw-r--r-- | src/controllers/bulk/bulkcontroller.cpp | 4 | ||||
-rw-r--r-- | src/controllers/hid/hidcontroller.cpp | 4 | ||||
-rw-r--r-- | src/controllers/midi/hss1394controller.cpp | 4 | ||||
-rw-r--r-- | src/controllers/midi/portmidicontroller.cpp | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index 4d038961c5..5b6b446e8a 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -94,7 +94,9 @@ BulkController::BulkController(libusb_context* context, } BulkController::~BulkController() { - close(); + if (isOpen()) { + close(); + } } QString BulkController::presetExtension() { diff --git a/src/controllers/hid/hidcontroller.cpp b/src/controllers/hid/hidcontroller.cpp index 7175d85b93..e8d6940006 100644 --- a/src/controllers/hid/hidcontroller.cpp +++ b/src/controllers/hid/hidcontroller.cpp @@ -109,7 +109,9 @@ HidController::HidController(const hid_device_info deviceInfo) } HidController::~HidController() { - close(); + if (isOpen()) { + close(); + } delete [] hid_path; delete [] hid_serial_raw; } diff --git a/src/controllers/midi/hss1394controller.cpp b/src/controllers/midi/hss1394controller.cpp index b1bc533459..688ede11e2 100644 --- a/src/controllers/midi/hss1394controller.cpp +++ b/src/controllers/midi/hss1394controller.cpp @@ -76,7 +76,9 @@ Hss1394Controller::Hss1394Controller(const hss1394::TNodeInfo deviceInfo, } Hss1394Controller::~Hss1394Controller() { - close(); + if (isOpen()) { + close(); + } } int Hss1394Controller::open() { diff --git a/src/controllers/midi/portmidicontroller.cpp b/src/controllers/midi/portmidicontroller.cpp index aa75175bac..68d35b7d8f 100644 --- a/src/controllers/midi/portmidicontroller.cpp +++ b/src/controllers/midi/portmidicontroller.cpp @@ -43,7 +43,9 @@ PortMidiController::PortMidiController(const PmDeviceInfo* inputDeviceInfo, } PortMidiController::~PortMidiController() { - close(); + if (isOpen()) { + close(); + } } int PortMidiController::open() { |