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

merge conflict fixed in filename bug

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 12:09:10 +01:00
parent 7577d03e75 e19d564364
commit 1e849097ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -8137,9 +8137,8 @@ string slsDetector::setFileName(string s) {
pthread_mutex_lock(&ms);
fileIO::setFileName(parentDet->getNameFromReceiverFilePrefix(string(retval)));
pthread_mutex_unlock(&ms);
*/
*/
sretval = fileIO::getNameFromReceiverFilePrefix(string(retval));
}
if(ret==FORCE_UPDATE)