From 1fe473e830b937b05052fe69cb7bfccde451055a Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 25 Feb 2019 14:45:14 +0100
Subject: [PATCH] client: for set port functions, moved forceupdate outside to
 automatically close previous function call

---
 .../slsDetector/slsDetector.cpp               | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index c3446d89d..1e8daa999 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -868,13 +868,13 @@ int slsDetector::setControlPort(int port_number) {
 				thisDetector->controlPort = retval;
 				FILE_LOG(logDEBUG1) << "Control port: " << retval;
 			}
-			if (ret == FORCE_UPDATE) {
-				ret = updateDetector();
-			}
 		} else {
 			thisDetector->controlPort = port_number;
 		}
 	}
+	if (ret == FORCE_UPDATE) {
+		ret = updateDetector();
+	}
 	return thisDetector->controlPort;
 }
 
@@ -895,13 +895,13 @@ int slsDetector::setStopPort(int port_number) {
                 thisDetector->stopPort = retval;
                 FILE_LOG(logDEBUG1) << "Stop port: " << retval;
             }
-            if (ret == FORCE_UPDATE) {
-                ret = updateDetector();
-            }
         } else {
             thisDetector->stopPort = port_number;
         }
     }
+    if (ret == FORCE_UPDATE) {
+        ret = updateDetector();
+    }
     return thisDetector->stopPort;
 }
 
@@ -923,13 +923,14 @@ int slsDetector::setReceiverPort(int port_number) {
                 thisDetector->receiverTCPPort = retval;
                 FILE_LOG(logDEBUG1) << "Receiver port: " << retval;
             }
-            if (ret == FORCE_UPDATE) {
-                ret = updateReceiver();
-            }
+
         } else {
             thisDetector->receiverTCPPort = port_number;
         }
     }
+    if (ret == FORCE_UPDATE) {
+        ret = updateReceiver();
+    }
     return thisDetector->receiverTCPPort;
 }