Reset meta data if dup is found

src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc

@@ -119,6 +119,7 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
     QString factGroup;
     FactMetaData* metaData = NULL;
     int xmlState = XmlStateNone;
+    bool badMetaData = true;
     
     while (!xml.atEnd()) {
         if (xml.isStartElement()) {
@@ -215,15 +216,18 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
                 }
                 
                 // Now that we know type we can create meta data object and add it to the system
+                
                 metaData = new FactMetaData(foundType);
                 Q_CHECK_PTR(metaData);
-                metaData->setGroup(factGroup);
                 if (_mapParameterName2FactMetaData.contains(name)) {
-                    // We can't trust the default value since we have dups
+                    // We can't trust the meta dafa since we have dups
                     qDebug() << "Duplicate parameter found:" << name;
-                    _mapParameterName2FactMetaData[name]->clearDefaultValue();
+                    badMetaData = true;
+                    // Reset to default meta data
+                    _mapParameterName2FactMetaData[name] = metaData;
                 } else {
                     _mapParameterName2FactMetaData[name] = metaData;
+                    metaData->setGroup(factGroup);
                     
                     if (xml.attributes().hasAttribute("default")) {
                         bool convertOk;
@@ -244,6 +248,7 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
                     return;
                 }
 
+                if (!badMetaData) {
                     if (elementName == "short_desc") {
                         Q_ASSERT(metaData);
                         QString text = xml.readElementText();
@@ -292,12 +297,14 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
                         qDebug() << "Unknown element in XML: " << elementName;
                     }
                 }
+            }
         } else if (xml.isEndElement()) {
             QString elementName = xml.name().toString();
 
             if (elementName == "parameter") {
                 // Done loading this one parameter
                 metaData = NULL;
+                badMetaData = false;
                 xmlState = XmlStateFoundGroup;
             } else if (elementName == "group") {
                 xmlState = XmlStateFoundVersion;