From 4718378d0aebb566ff2eca07f808d7491214e3f1 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 6 Dec 2017 19:21:28 +0100 Subject: [PATCH] corrected bug fix in r_restreamstop --- .../slsDetector/slsDetectorCommand.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index e3246586b..a550f1fda 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -6064,11 +6064,22 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) { if (action==GET_ACTION) return string("cannot get"); else { - if ((myDet->getRunStatus() != IDLE) || (myDet->getReceiverStatus() != IDLE)) { - std::cout << "Could not restream stop from receiver. Acquisition still in progress" << std::endl; + runStatus s = myDet->getRunStatus(); + if (s != IDLE) { + std::cout << "Could not restream stop from receiver.\n" + "Detector Acquisition still in progress. Status: " << myDet->runStatusType(s) << std::endl; sprintf(answer,"%d",0); + return string (answer); } - sprintf(answer,"%d",(myDet->restreamStopFromReceiver() == OK) ? 1 : 0); + s = myDet->getReceiverStatus(); + if (s != IDLE) { + std::cout << "Could not restream stop from receiver.\n" + "Receiver Acquisition still in progress. Status: " << myDet->runStatusType(s) << std::endl; + sprintf(answer,"%d",0); + return string (answer); + } + else + sprintf(answer,"%d",(myDet->restreamStopFromReceiver() == OK) ? 1 : 0); } return string(answer); }