Fix sync monitor re-load

Author: medengineer

Source/Processors/RecordNode/RecordNode.cpp

@@ -991,55 +991,52 @@ void RecordNode::loadCustomParametersFromXml(XmlElement* xml)
 
     for (auto stream : dataStreams)
     {
-        int matchingIndex = findMatchingStreamParameters(stream);
-        const uint16 streamId = stream->getStreamId();
 
-        if (matchingIndex > -1)
+        if (findMatchingStreamParameters(stream) > -1)
         {
-            int savedStreamIndex = -1;
+
+			const uint16 streamId = stream->getStreamId();
 
             for (auto* subNode : xml->getChildIterator())
             {
-                if (subNode->hasTagName("STREAM"))
+                if (subNode->hasTagName("STREAM")
+					&& subNode->getStringAttribute("name") == stream->getName()
+					&& subNode->getIntAttribute("source_node_id") == stream->getSourceNodeId())
                 {
-                    savedStreamIndex++;
-
-                    if (savedStreamIndex == matchingIndex)
-                    {
-                        if (subNode->getBoolAttribute("isMainStream", false))
-                        {
-                            setMainDataStream(streamId);
-                        }
-
-                        setSyncLine(streamId, subNode->getIntAttribute("sync_line", 0));
-
-                        String recordState = subNode->getStringAttribute("recording_state", "ALL");
-
-                        for (int ch = 0; ch < recordContinuousChannels[streamId].size(); ch++)
-                        {
-                            bool channelState;
-
-                            if (recordState.equalsIgnoreCase("ALL"))
-                            {
-                                channelState = true;
-                            }
-                            else if (recordState.equalsIgnoreCase("NONE"))
-                            {
-                                channelState = false;
-                            }
-                            else {
-                                if (recordState.length() > ch)
-                                {
-                                    channelState = recordState.substring(ch, ch + 1) == "1" ? true : false;
-                                }
-                                else {
-                                    channelState = true;
-                                }
-                            }
-
-                            recordContinuousChannels[streamId][ch] = channelState;
-                        }
-                    }
+
+					if (subNode->getBoolAttribute("isMainStream", false))
+					{
+						setMainDataStream(streamId);
+					}
+
+					setSyncLine(streamId, subNode->getIntAttribute("sync_line", 0));
+
+					String recordState = subNode->getStringAttribute("recording_state", "ALL");
+
+					for (int ch = 0; ch < recordContinuousChannels[streamId].size(); ch++)
+					{
+						bool channelState;
+
+						if (recordState.equalsIgnoreCase("ALL"))
+						{
+							channelState = true;
+						}
+						else if (recordState.equalsIgnoreCase("NONE"))
+						{
+							channelState = false;
+						}
+						else {
+							if (recordState.length() > ch)
+							{
+								channelState = recordState.substring(ch, ch + 1) == "1" ? true : false;
+							}
+							else {
+								channelState = true;
+							}
+						}
+
+						recordContinuousChannels[streamId][ch] = channelState;
+					}
 
                 }
             }