From 52cf790dde93da00d1026c8d6da685693649ab42 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 7 Nov 2016 17:57:03 +0100
Subject: [PATCH] deletion of retval in getdatafrom, client

---
 .../jungfrauDetectorServerv2.2.0              | Bin 126920 -> 126920 bytes
 .../multiSlsDetector/multiSlsDetector.cpp     |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0 b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0
index 91b3b7653ff5d1ffd6daf1f7b98b510b80a17251..f39d3b28b0be310b9ca0cda59b407ca45172b88b 100755
GIT binary patch
delta 23
fcmX?cpZ&yr_6b@{8*ffeoW>~8=(5#?vE@Agg$@dQ

delta 23
fcmX?cpZ&yr_6b@{(_E$}PGgj4blK{{*zz6#d;<y0

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 5a2712e91..131fccc75 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -1438,8 +1438,8 @@ int* multiSlsDetector::getDataFromDetector() {
 #ifdef VERBOSE
 				cout << "Detector " << id << " does not have data left " << endl;
 #endif
-				if((detectors[id]->getDetectorsType() != EIGER)||(detectors[id]->getDetectorsType() != JUNGFRAU))
-					break;
+				/*if((detectors[id]->getDetectorsType() != EIGER)||(detectors[id]->getDetectorsType() != JUNGFRAU))
+					break;*/
 			}
 			p+=n/sizeof(int);
 		}
@@ -1447,9 +1447,10 @@ int* multiSlsDetector::getDataFromDetector() {
 
 	//eiger returns only null
 	detectorType types = getDetectorsType();
-	//if(types == EIGER )
-	if(types == EIGER || types == JUNGFRAU)
+	if(types == EIGER || types == JUNGFRAU){
+		delete [] retval;
 		return NULL;
+	}
 
 	if (nodatadet>=0) {
 		for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {