diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 120446c7d..8f0c3cc33 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3620,33 +3620,33 @@ int multiSlsDetector::exitServer() { /** returns the detector trimbit/settings directory */ -// char* multiSlsDetector::getSettingsDir() { string multiSlsDetector::getSettingsDir() { - string s0="", s1="", s; + string concatenatedDir, firstDir; + bool dirNotSame = false; - //char ans[1000]; for (int idet=0; idetnumberOfDetectors; ++idet) { if (detectors[idet]) { - s=detectors[idet]->getSettingsDir(); + string thisDir = detectors[idet]->getSettingsDir(); if(detectors[idet]->getErrorMask()) - setErrorMask(getErrorMask()|(1<