Merge branch '3.0-rc' into developer

This commit is contained in:
Dhanya Maliakal 2017-08-10 19:09:58 +02:00
commit aca3b4ca1b

View File

@ -1463,6 +1463,9 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
return myDet->runStatusType(s);
}
else if (cmd=="busy") {
if (action==PUT_ACTION) {
return string ("cannot put");
}
char answer[100];
sprintf(answer,"%d", myDet->getAcquiringFlag());
return string(answer);