From 7db6b7bca80a5d85dac60b216fcb846be857a9f0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 29 Jun 2018 14:52:52 +0200 Subject: [PATCH] slsDetectorSoftware: command line should print same file when loading or saving to trimbits file --- slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index f129aca7a..0160d1602 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -4618,12 +4618,16 @@ string slsDetectorCommand::cmdSettings(int narg, char *args[], int action) { #ifdef VERBOSE std::cout<< " trimfile " << sval << std::endl; #endif + int ret = OK; if (action==GET_ACTION) { //create file names - myDet->saveSettingsFile(sval, -1); + ret = myDet->saveSettingsFile(sval, -1); } else if (action==PUT_ACTION) { - myDet->loadSettingsFile(sval,-1); + ret = myDet->loadSettingsFile(sval,-1); } + if (ret == OK) + return sval; + else return string("not successful"); } return myDet->getSettingsFile(); } else if (cmd=="trim") {