From dc5384f0f98db74c3b96724f6ec0133a56b55ce9 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Thu, 23 Nov 2017 17:20:07 +0100
Subject: [PATCH] copy zmq port even if receiver not online, else it is lost

---
 slsDetectorSoftware/slsDetector/slsDetector.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index ed9b04e39..b869513bb 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6259,6 +6259,8 @@ string slsDetector::setReceiverStreamingPort(string port) {
 	else
 		sscanf(port.c_str(),"%d",&arg);
 
+	 thisDetector->receiver_zmqport = arg;
+
 	// send to receiver
 	int fnum=F_SET_RECEIVER_STREAMING_PORT;
 	int ret = FAIL;
@@ -6271,8 +6273,10 @@ string slsDetector::setReceiverStreamingPort(string port) {
 			ret=thisReceiver->sendInt(fnum,retval,arg);
 			disconnectData();
 		}
-		if(ret!=FAIL)
-			thisDetector->receiver_zmqport = retval;
+		if (ret==FAIL) {
+			setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
+			std::cout << "Warning: Could not set receiver zmq port" << std::endl;
+		}
 		if(ret==FORCE_UPDATE)
 			updateReceiver();
 	}