From 7c1423d65420d2090c8dfac5ce732a8b7b078661 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 28 Nov 2017 16:31:43 +0100
Subject: [PATCH] zmqip fix to restart reciever streaming form command line,
 fix to not have sls_receiver_defs in zmqSocket.h incldue

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 2 +-
 slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 051d7e8eb..ca8d094fa 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -5968,7 +5968,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 			else {
 				thisData = new detectorData(NULL,NULL,NULL,getCurrentProgress(),currentFileName.c_str(),maxX,maxY,multiframe, multidatabytes, dr, currentFileIndex);
 			}
-			dataReady(thisData, currentFrameIndex, currentSubFrameIndex, pCallbackArg);
+			dataReady(thisData, currentFrameIndex, (((dr == 32) && (eiger)) ? currentSubFrameIndex : -1), pCallbackArg);
 			delete thisData;
 				//cout<<"Send frame #"<< currentFrameIndex << " to gui"<<endl;
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
index 7ffe9bcd5..bad18e23e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
@@ -3977,13 +3977,16 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
 		t=CLIENT_STREAMING_SRC_IP;
 	}else if (cmd=="rx_zmqip") {
 		t=RECEIVER_STREAMING_SRC_IP;
+		// if streaming, switch it off
+		prev_streaming = myDet->enableDataStreamingFromReceiver();
+		if (prev_streaming) myDet->enableDataStreamingFromReceiver(0);
 	}
 	else return ("unknown network parameter")+cmd;
 
 	if (action==PUT_ACTION) {
 		myDet->setNetworkParameter(t, args[1]);
 		// switch it back on, if it had been switched on
-		if (prev_streaming && t == RECEIVER_STREAMING_PORT)
+		if (prev_streaming && (t == RECEIVER_STREAMING_PORT || t == RECEIVER_STREAMING_SRC_IP))
 			myDet->enableDataStreamingFromReceiver(1);
 
 	}