Merge pull request #331 from tne-lab/car-fix

CAR fix because of xml being loaded twice

Author: medengineer

Plugins/CAR/CAR.cpp

@@ -135,7 +135,7 @@ void CAR::setAffectedChannelState (int channel, bool newState)
     if (! newState)
         m_affectedChannels.removeFirstMatchingValue (channel);
     else
-        m_affectedChannels.add (channel);
+        m_affectedChannels.addIfNotAlreadyThere (channel);
 }
 
 void CAR::saveCustomChannelParametersToXml(XmlElement* channelElement,

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -1038,38 +1038,38 @@ void GenericProcessor::loadFromXml()
 	update(); // make sure settings are updated
 	if (parametersAsXml != nullptr)
 	{
-		if (!m_isParamsWereLoaded)
-		{
-			std::cout << "Loading parameters for " << m_name << std::endl;
+        if (!m_isParamsWereLoaded)
+        {
+            std::cout << "Loading parameters for " << m_name << std::endl;
 
-			// use parametersAsXml to restore state
-			loadCustomParametersFromXml();
+            // use parametersAsXml to restore state
+            loadCustomParametersFromXml();
 
-			// load editor parameters
-			forEachXmlChildElement(*parametersAsXml, xmlNode)
-			{
-				if (xmlNode->hasTagName("EDITOR"))
-				{
-					getEditor()->loadEditorParameters(xmlNode);
-				}
-			}
-		}
-		forEachXmlChildElement(*parametersAsXml, xmlNode)
-		{
-			if (xmlNode->hasTagName("CHANNEL"))
-			{
-				loadChannelParametersFromXml(xmlNode, InfoObjectCommon::DATA_CHANNEL);
-			}
-			else if (xmlNode->hasTagName("EVENTCHANNEL"))
-			{
-				loadChannelParametersFromXml(xmlNode, InfoObjectCommon::EVENT_CHANNEL);
-			}
-			else if (xmlNode->hasTagName("SPIKECHANNEL"))
-			{
-				loadChannelParametersFromXml(xmlNode, InfoObjectCommon::SPIKE_CHANNEL);
-			}
-		}
+            // load editor parameters
+            forEachXmlChildElement(*parametersAsXml, xmlNode)
+            {
+                if (xmlNode->hasTagName("EDITOR"))
+                {
+                    getEditor()->loadEditorParameters(xmlNode);
+                }
+            }
 
+            forEachXmlChildElement(*parametersAsXml, xmlNode)
+            {
+                if (xmlNode->hasTagName("CHANNEL"))
+                {
+                    loadChannelParametersFromXml(xmlNode, InfoObjectCommon::DATA_CHANNEL);
+                }
+                else if (xmlNode->hasTagName("EVENTCHANNEL"))
+                {
+                    loadChannelParametersFromXml(xmlNode, InfoObjectCommon::EVENT_CHANNEL);
+                }
+                else if (xmlNode->hasTagName("SPIKECHANNEL"))
+                {
+                    loadChannelParametersFromXml(xmlNode, InfoObjectCommon::SPIKE_CHANNEL);
+                }
+            }
+        }
 	}
 
 	m_isParamsWereLoaded = true;