From 5e7d22357ef8edc0d8b99b6e7de83012921dbf69 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 8 May 2013 15:18:05 +0000
Subject: [PATCH] solved bug for real: undefined state when stoppping receiver

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@546 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetector/slsDetector.cpp               | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index adde92ef5..8ad2937b0 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6063,30 +6063,36 @@ int* slsDetector::readFrameFromReceiver(char* fName, int &fIndex){
 		std::cout<< "slsDetector: Reading frame from receiver "<< thisDetector->dataBytes << " " <<nel <<std::endl;
 #endif
 		if (connectData() == OK){
-			dataSocket->SendDataOnly(&fnum,sizeof(fnum));
-			dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
+			if(!thisDetector->stoppedFlag){
+				dataSocket->SendDataOnly(&fnum,sizeof(fnum));
+				dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
 
-			if (ret==FAIL) {
-				n= dataSocket->ReceiveDataOnly(mess,sizeof(mess));
-				std::cout<< "Detector returned: " << mess << " " << n << std::endl;
-				delete [] retval;
-				dataSocket->Disconnect();
-				return NULL;
-			} else {
-				n=dataSocket->ReceiveDataOnly(fName,MAX_STR_LENGTH);
-				n=dataSocket->ReceiveDataOnly(&fIndex,sizeof(fIndex));
-				n=dataSocket->ReceiveDataOnly(retval,thisDetector->dataBytes);
-#ifdef VERBOSE
-				std::cout<< "Received "<< n << " data bytes" << std::endl;
-#endif
-				if (n!=thisDetector->dataBytes) {
-					std::cout<<endl<< "wrong data size received: received " << n << " but expected from receiver " << thisDetector->dataBytes << std::endl;
-					ret=FAIL;
+				if (ret==FAIL) {
+					n= dataSocket->ReceiveDataOnly(mess,sizeof(mess));
+					std::cout<< "Detector returned: " << mess << " " << n << std::endl;
 					delete [] retval;
 					dataSocket->Disconnect();
 					return NULL;
+				} else {
+					n=dataSocket->ReceiveDataOnly(fName,MAX_STR_LENGTH);
+					n=dataSocket->ReceiveDataOnly(&fIndex,sizeof(fIndex));
+					n=dataSocket->ReceiveDataOnly(retval,thisDetector->dataBytes);
+
+#ifdef VERBOSE
+					std::cout<< "Received "<< n << " data bytes" << std::endl;
+#endif
+					if (n!=thisDetector->dataBytes) {
+						std::cout<<endl<< "wrong data size received: received " << n << " but expected from receiver " << thisDetector->dataBytes << std::endl;
+						ret=FAIL;
+						delete [] retval;
+						dataSocket->Disconnect();
+						return NULL;
+					}
 				}
 			}
+			else
+				cout << "Acquisition stopped" << endl;
+
 			dataSocket->Disconnect();
 		}
 	}