From 1d14dc6ff431a73f1cc779b7d0eeec21c64ea669 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Wed, 17 Oct 2018 16:58:09 +0200
Subject: [PATCH] void signature of processData

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 6 +++---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 1d66e1816..69e10c3c7 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3809,9 +3809,9 @@ void multiSlsDetector::startProcessingThread() {
 // }
 
 
-void* multiSlsDetector::processData() {
+void multiSlsDetector::processData() {
 	if(setReceiverOnline()==OFFLINE_FLAG){
-		return 0;
+		return;
 	} 
 	else{
 		if(dataReady) {
@@ -3857,7 +3857,7 @@ void* multiSlsDetector::processData() {
 			}
 		}
 	}
-	return 0;
+	return;
 }
 
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index e4ccd0919..1c2bcffd0 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1588,7 +1588,7 @@ public:
 	 * Combines data from all readouts and gives it to the gui
 	 * or just gives progress of acquisition by polling receivers
 	 */
-	void* processData();
+	void processData();
 
 private:
 	/**