From 20dc338c90d7dfc9a0579924b935f5fe65888a10 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 23 Nov 2017 17:00:12 +0100 Subject: [PATCH] when changing network parameter, switch off data streaming only if on --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 0fe6a90fa..58a02fe36 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3696,13 +3696,13 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){ switch (p) { case RECEIVER_STREAMING_PORT: prev_streaming = enableDataStreamingFromReceiver(); - enableDataStreamingFromReceiver(0); - enableDataStreamingToClient(0); + if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); + if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); break; case CLIENT_STREAMING_PORT: prev_streaming = enableDataStreamingToClient(); - enableDataStreamingToClient(0); - enableDataStreamingFromReceiver(0); + if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); + if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); break; default: break; }