detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 15:18:53 +01:00
Code Issues Actions Packages Releases Activity

slsDetectorSoftware: order of zmq deletion in multi destructor to first because api using zmq to get data will need to be deleted first

Browse Source
This commit is contained in:
maliakal_d
2018-07-30 18:51:18 +02:00
parent e38e500e16
commit 0dc1e10bd3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -42,6 +42,11 @@ multiSlsDetector::multiSlsDetector(int id, bool verify, bool update)
multiSlsDetector::~multiSlsDetector() { multiSlsDetector::~multiSlsDetector() {
for (vector<ZmqSocket*>::const_iterator it = zmqSocket.begin(); it != zmqSocket.end(); ++it) {
delete(*it);
}
zmqSocket.clear();
for (vector<slsDetector*>::const_iterator it = detectors.begin(); it != detectors.end(); ++it) { for (vector<slsDetector*>::const_iterator it = detectors.begin(); it != detectors.end(); ++it) {
delete(*it); delete(*it);
} }
@@ -52,11 +57,6 @@ multiSlsDetector::~multiSlsDetector() {
delete sharedMemory; delete sharedMemory;
} }
for (vector<ZmqSocket*>::const_iterator it = zmqSocket.begin(); it != zmqSocket.end(); ++it) {
delete(*it);
}
zmqSocket.clear();
destroyThreadPool(); destroyThreadPool();
} }