diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 61bca239c..697e1b0b6 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -42,6 +42,11 @@ multiSlsDetector::multiSlsDetector(int id, bool verify, bool update) multiSlsDetector::~multiSlsDetector() { + for (vector::const_iterator it = zmqSocket.begin(); it != zmqSocket.end(); ++it) { + delete(*it); + } + zmqSocket.clear(); + for (vector::const_iterator it = detectors.begin(); it != detectors.end(); ++it) { delete(*it); } @@ -52,11 +57,6 @@ multiSlsDetector::~multiSlsDetector() { delete sharedMemory; } - for (vector::const_iterator it = zmqSocket.begin(); it != zmqSocket.end(); ++it) { - delete(*it); - } - zmqSocket.clear(); - destroyThreadPool(); }