detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity

reduced gui_client crashes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@498 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-03-19 16:00:25 +00:00
parent 84c65b7884
commit 8c06405622
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1332,12 +1332,12 @@ slsDetectorDefs::detectorType slsDetector::getDetectorsType(int pos){
// if n=GET_FLAG returns the number of installed modules,
int slsDetector::setNumberOfModules(int n, dimension d){
int arg[2], retval;
int arg[2], retval=1;
int fnum=F_SET_NUMBER_OF_MODULES;
int ret=FAIL;
char mess[100];
char mess[100]="dummy";
int connect;
int num;
arg[0]=d;
arg[1]=n;
@ -1358,11 +1358,11 @@ int slsDetector::setNumberOfModules(int n, dimension d){
if (connect == UNDEFINED)
cout << "no control socket?" << endl;
else if (connect == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->SendDataOnly(&arg,sizeof(arg));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
num = controlSocket->SendDataOnly(&fnum,sizeof(fnum));
num = controlSocket->SendDataOnly(&arg,sizeof(arg));
num = controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret!=FAIL) {
controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
num = controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
} else {
controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;