detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-11 18:03:01 +01:00
parent d6bdbf8524 03de29de90
commit d2319459df
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -300,9 +300,8 @@ multiSlsDetector::~multiSlsDetector() {
int multiSlsDetector::createThreadPool(){
if(threadpool){
threadpool->destroy_threadpool();
}
if(threadpool)
destroyThreadPool();
int numthreads = thisMultiDetector->numberOfDetectors;
if(numthreads < 1){
numthreads = 1; //create threadpool anyway, threads initialized only when >1 detector added
@ -328,7 +327,6 @@ int multiSlsDetector::createThreadPool(){
void multiSlsDetector::destroyThreadPool(){
if(threadpool){
threadpool->destroy_threadpool();
delete threadpool;
threadpool=0;
#ifdef VERBOSE