From 7a6797b23e6d1c9e2762a1185caa623fd5c78306 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Wed, 11 Mar 2020 11:09:41 +0100
Subject: [PATCH] zmq sockets client checked before creating them

---
 RELEASE.txt                                               | 7 +++++++
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/RELEASE.txt b/RELEASE.txt
index 521e0aaeb..0a3959b76 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -25,6 +25,7 @@ This document describes the differences between 4.2.0 and 4.1.1 releases.
     - (Receiver) performance (memory allocation and alignment, file buffering)
     - (Package) Removed warnings including memory overlap copy
     - (Users) Added setflippeddatax to users class
+    - (zmq) Client zmq threads created each time client data streaming enabled
 
     Compared to 4.1.1, 
         - no firmware update required for this release
@@ -76,6 +77,12 @@ This document describes the differences between 4.2.0 and 4.1.1 releases.
     -------
     1.  Many warnings have been fixed, including those with overlapping 
         memory copies for source and destination. 
+
+    Client
+    ------
+    1.  Each time client data streaming was enabled to receive, it
+        creates zmq sockets without checking if they were already created.
+        This is fixed now.
     
     
     
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index c81bac615..b2dc2bfa2 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -5159,6 +5159,9 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy) {
 		cout << "Destroyed Receiving Data Socket(s)" << endl;
 		return OK;
 	}
+	if (client_downstream) {
+		return OK;
+	}
 
 	cprintf(MAGENTA, "Going to create data sockets\n");