Skip to content

Commit 7a64cdb

Browse files
committed
Fix error when xml file has comments
1 parent f6dbf0b commit 7a64cdb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Editor/FntParse.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ public void DoXMLPase(ref string content)
4848
{
4949
XmlDocument xml = new XmlDocument();
5050
xml.LoadXml(content);
51+
XmlElement rootNode = xml.DocumentElement;
5152

52-
XmlNode info = xml.GetElementsByTagName("info")[0];
53-
XmlNode common = xml.GetElementsByTagName("common")[0];
54-
XmlNodeList pages = xml.GetElementsByTagName("pages")[0].ChildNodes;
55-
XmlNodeList chars = xml.GetElementsByTagName("chars")[0].ChildNodes;
53+
XmlNode info = rootNode.SelectSingleNode("info");
54+
XmlNode common = rootNode.SelectSingleNode("common");
55+
XmlNodeList pages = rootNode.SelectNodes("pages/page");
56+
XmlNodeList chars = rootNode.SelectNodes("chars/char");
5657

5758

5859
fontName = info.Attributes.GetNamedItem("face").InnerText;
@@ -89,10 +90,9 @@ public void DoXMLPase(ref string content)
8990
}
9091

9192
// kernings
92-
XmlNode kerningsNode = xml.GetElementsByTagName("kernings")[0];
93-
if (kerningsNode != null && kerningsNode.HasChildNodes)
93+
XmlNodeList kerns = rootNode.SelectNodes("kernings/kerning");
94+
if (kerns != null && kerns.Count > 0)
9495
{
95-
XmlNodeList kerns = kerningsNode.ChildNodes;
9696
kernings = new Kerning[kerns.Count];
9797
for (int i = 0; i < kerns.Count; i++)
9898
{

0 commit comments

Comments
 (0)