Allow old XML formats to import

xLightsSequencer · May 12, 2024 · fa45c66 · fa45c66 · cybercop23 · May 12, 2024
1 parent 5f6bab9
commit fa45c66
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/xLights/LayoutPanel.cpp b/xLights/LayoutPanel.cpp
@@ -3664,7 +3664,7 @@ void LayoutPanel::FinalizeModel()
 
             // Models that support visitors don't use the ImportXlightsModel method
             // If there are import issues we need to try to fix them inside the XmlSerializer
-            if (!_newModel->SupportsVisitors()) {
+            if (!_newModel->SupportsVisitors() && !XmlSerializer::IsXmlSerializerFormat(_newModel->GetModelXml())) {
                 xlights->AddTraceMessage("LayoutPanel::FinalizeModel Do the import. " + _lastXlightsModel);
                 xlights->AddTraceMessage("LayoutPanel::FinalizeModel Model type " + _newModel->GetDisplayAs());
                 _newModel->ImportXlightsModel(_lastXlightsModel, xlights, min_x, max_x, min_y, max_y);

diff --git a/xLights/models/Model.cpp b/xLights/models/Model.cpp
@@ -6363,7 +6363,7 @@ Model* Model::GetXlightsModel(Model* model, std::string& last_model, xLightsFram
         wxXmlNode* root = doc.GetRoot();
 
         // check for XmlSerializer format
-        if (root->GetAttribute(XmlNodeKeys::TypeAttribute, "") == XmlNodeKeys::ExportedAttribute) {
+        if (XmlSerializer::IsXmlSerializerFormat(root)) {
             // grab the attributes I want to keep
             std::string startChannel = model->GetModelXml()->GetAttribute("StartChannel", "1").ToStdString();
             auto x = model->GetHcenterPos();

diff --git a/xLights/models/XmlSerializer.h b/xLights/models/XmlSerializer.h
@@ -370,6 +370,14 @@ struct XmlSerializer
     {
     }
 
+    static bool IsXmlSerializerFormat(const wxXmlNode *node)
+    {
+        if (node->GetAttribute(XmlNodeKeys::TypeAttribute, "") == XmlNodeKeys::ExportedAttribute) {
+            return true;
+        }
+        return false;
+    }
+
     // Serializes and Saves a single model into an XML document
     void SerializeAndSaveModel(const BaseObject &object)
     {