From 217f63b701f47927567c08a8393763b04dcfa2a8 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 6 Mar 2013 10:00:40 +0000
Subject: [PATCH] Small change in the receiver concerning the data to the GUI

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@483 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsReceiver/slsReceiverFunctionList.cpp         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 652735c4d..b6675f430 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -493,23 +493,28 @@ int slsReceiverFunctionList::startWriting(){
 				totalFramesCaught++;
 				//currframenum = (int)(*((int*)dataWriteFrame->buffer));
 				currframenum = (int)(*((int*)wbuf));
-				if(guiRequiresData)
+				if(guiRequiresData) {
 				  guiData=latestData;
-				else
+				}  else {
 				  guiData=NULL;
+				}
 
 				if(enableFileWrite){
-				  if (writeReceiverData)
+				  if (writeReceiverData) {
 				    writeReceiverData(wbuf,bufferSize, sfilefd, pwriteReceiverDataArg);
+				  }
 				  if (cbAction<2) {
 				    rawDataReadyCallBack(currframenum, wbuf,sfilefd, guiData,pRawDataReady);
 				  } else {
 				    fwrite(wbuf, 1, bufferSize, sfilefd);
 				  }
+				  
 				}
 
 				if(guiRequiresData){
-				  memcpy(latestData,wbuf,bufferSize);
+				  if (cbAction>=2)
+				    memcpy(latestData,wbuf,bufferSize);
+				  //memcpy(latestData,wbuf,bufferSize);
 				  guiRequiresData=0;
 				}
 				//cout<<"write index:"<<(int)(*(int*)latestData)<<endl;