From 8328b30cbda818b9e0990627d7cd0bf7e5778684 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 21 Nov 2017 14:58:07 +0100
Subject: [PATCH] removed merge conflicts from bug fix of zmq buffering while
 acquire from command line

---
 .../multiSlsDetector/multiSlsDetector.cpp     | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index b80daaeea..dc2a8740b 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3730,22 +3730,16 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 	// disable data streaming before changing zmq port (but only if they were on)
 	int prev_streaming = 0;
 	switch (p) {
-	case RECEIVER_STREAMING_PORT:
+	case CLIENT_STREAMING_PORT:
+	case CLIENT_STREAMING_SRC_IP:
 		prev_streaming = enableDataStreamingFromReceiver();
 		enableDataStreamingFromReceiver(0);
 		enableDataStreamingToClient(0);
 		break;
-	case CLIENT_STREAMING_PORT:
-		prev_streaming = enableDataStreamingToClient();
-		enableDataStreamingToClient(0);
-		enableDataStreamingFromReceiver(0);
-		break;
+	case RECEIVER_STREAMING_PORT:
 	case RECEIVER_STREAMING_SRC_IP:
 		prev_streaming = enableDataStreamingFromReceiver();
 		enableDataStreamingFromReceiver(0);
-		break;
-	case CLIENT_STREAMING_SRC_IP:
-		prev_streaming = enableDataStreamingToClient();
 		enableDataStreamingToClient(0);
 		break;
 	default: break;
@@ -3808,17 +3802,10 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 	if (prev_streaming) {
 		switch (p) {
 		case RECEIVER_STREAMING_PORT:
-			enableDataStreamingFromReceiver(1);
-			enableDataStreamingToClient(1);
-			break;
 		case CLIENT_STREAMING_PORT:
-			enableDataStreamingToClient(1);
-			enableDataStreamingFromReceiver(1);
-			break;
 		case RECEIVER_STREAMING_SRC_IP:
-			enableDataStreamingFromReceiver(1);
-			break;
 		case CLIENT_STREAMING_SRC_IP:
+			enableDataStreamingFromReceiver(1);
 			enableDataStreamingToClient(1);
 			break;
 		default: break;