More generic change - handle & in export #5017

xLightsSequencer · Jan 12, 2025 · 5857c65 · 5857c65
1 parent c1fe519
commit 5857c65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/xLights/models/CustomModel.cpp b/xLights/models/CustomModel.cpp
@@ -1705,7 +1705,6 @@ void CustomModel::ExportXlightsModel()
     }
     wxString state = SerialiseState();
     if (state != "") {
-        state.Replace("&", "&amp;", true);
         f.Write(state);
     }
     wxString submodel = SerialiseSubmodel();

diff --git a/xLights/models/Model.cpp b/xLights/models/Model.cpp
@@ -2543,6 +2543,7 @@ wxString Model::SerialiseFace() const
             }
             res += "/>\n";
         }
+        res.Replace("&", "&amp;", true);
     }
 
     return res;
@@ -2685,6 +2686,7 @@ wxString Model::SerialiseState() const
             }
             res += "/>\n";
         }
+        res.Replace("&", "&amp;", true);
     }
 
     return res;