From 5eb8402742299a23005a66742b90a16be1cfd7f3 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 23 Nov 2017 17:28:35 +0100 Subject: [PATCH] bugfix zmq streaming both on --- .../multiSlsDetector/multiSlsDetector.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 58a02fe36..c866721e2 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3695,12 +3695,8 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){ int prev_streaming = 0; switch (p) { case RECEIVER_STREAMING_PORT: - prev_streaming = enableDataStreamingFromReceiver(); - if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); - if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); - break; case CLIENT_STREAMING_PORT: - prev_streaming = enableDataStreamingToClient(); + prev_streaming = (enableDataStreamingFromReceiver() || enableDataStreamingToClient()); if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); break; @@ -3764,12 +3760,9 @@ 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); + enableDataStreamingToClient(1); break; default: break; }