Prevent double-adding tabs when using merger

Author: jsiegle

Source/UI/DataViewport.cpp

@@ -47,8 +47,8 @@ int DataViewport::addTabToDataViewport(String name,
     if (tabArray.size() == 0)
         setVisible(true);
 
-    if (tabArray.contains(tabIndex))
-        return tabIndex;
+    //if (tabArray.contains(tabIndex))
+    //    return tabIndex;
 
     addTab(name, Colours::lightgrey, component, false, tabIndex);
 
@@ -77,10 +77,13 @@ int DataViewport::addTabToDataViewport(String name,
 void DataViewport::addTabAtIndex(int tabIndex_, String tabName, Component* tabComponent)
 {
 
-    savedTabIndices.add(tabIndex_);
-    savedTabComponents.add(tabComponent);
-    savedTabNames.add(tabName);
-
+	if (!savedTabIndices.contains(tabIndex_))
+	{
+        savedTabIndices.add(tabIndex_);
+        savedTabComponents.add(tabComponent);
+        savedTabNames.add(tabName);
+	}
+    
 }
 
 
@@ -127,6 +130,8 @@ void DataViewport::saveStateToXml(XmlElement* xml)
 void DataViewport::loadStateFromXml(XmlElement* xml)
 {
 
+    //LOGD("DataViewport::loadStateFromXml()");
+    
     std::vector<int> tabOrder(savedTabIndices.size());
     std::iota(tabOrder.begin(), tabOrder.end(), 0); //Initializing
     sort(tabOrder.begin(), tabOrder.end(), [&](int i, int j)