From ff1b2ac19a30a2dcbf6975ccb3167193c9afd06c Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 4 Nov 2016 11:24:19 +0100
Subject: [PATCH] solving latestdata crash

---
 slsReceiverSoftware/src/UDPStandardImplementation.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index 0a89c0b95..5725996c3 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -632,8 +632,10 @@ int UDPStandardImplementation::setDynamicRange(const uint32_t i){
 		if(oldDynamicRange != dynamicRange){
 
 			//gui buffer
-			for(int i=0;i<numberofWriterThreads;i++){
+			for(int i=0;i<MAX_NUMBER_OF_WRITER_THREADS;i++){
 				if(latestData[i]){delete[] latestData[i]; latestData[i] = 0;}
+			}
+			for(int i=0;i<numberofWriterThreads;i++){
 				latestData[i] = new char[bufferSize];
 			}
 			//restructure fifo
@@ -687,8 +689,10 @@ int UDPStandardImplementation::setTenGigaEnable(const bool b){
 		if(oldTenGigaEnable != tengigaEnable){
 
 			//gui buffer
-			for(int i=0;i<numberofWriterThreads;i++){
+			for(int i=0;i<MAX_NUMBER_OF_WRITER_THREADS;i++){
 				if(latestData[i]){delete[] latestData[i]; latestData[i] = 0;}
+			}
+			for(int i=0;i<numberofWriterThreads;i++){
 				latestData[i] = new char[bufferSize];
 			}
 
@@ -872,6 +876,8 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
 	//allocate for latest data (frame copy for gui), free variables
 	for(int i=0; i<MAX_NUMBER_OF_WRITER_THREADS; i++){
 		if(latestData[i]) 	{delete[] latestData[i]; 	latestData[i] = 0;}
+	}
+	for(int i=0; i<numberofWriterThreads; i++){
 		latestData[i] = new char[bufferSize];
 	}