Merge branch '3.0' into externalgui

This commit is contained in:
Dhanya Maliakal 2017-08-23 18:01:58 +02:00
commit a236a7a9aa

View File

@ -4331,7 +4331,7 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
if (cmd=="roimask")
sprintf(ans,"0x%x",ret);
else
sprintf(ans,"0x%d",ret);
sprintf(ans,"%d",ret);
return string(ans);