diff --git a/Output/Cover/Blue.xml b/Output/Cover/Blue.xml index f078b728..9fcf7dd0 100644 --- a/Output/Cover/Blue.xml +++ b/Output/Cover/Blue.xml @@ -6,9 +6,8 @@ flokuep - - - Default + + %TEXT% @@ -25,8 +24,7 @@ 1110.8 - - 24 + 24 diff --git a/VocaluxeLib/Xml/CXmlDeserializer.cs b/VocaluxeLib/Xml/CXmlDeserializer.cs index 909305bd..db2dbb8a 100644 --- a/VocaluxeLib/Xml/CXmlDeserializer.cs +++ b/VocaluxeLib/Xml/CXmlDeserializer.cs @@ -40,7 +40,8 @@ namespace VocaluxeLib.Xml { el = new SMargin(); bool ok = true; - bool defOk = TryGetIntValue(xPath + "/Default", ref el.Default); + string val; + bool defOk = GetAttribute(xPath, "Default", out val) && int.TryParse(val, out el.Default); ok &= TryGetIntValue(xPath + "/Left", ref el.Left, el.Default); ok &= TryGetIntValue(xPath + "/Right", ref el.Right, el.Default); ok &= TryGetIntValue(xPath + "/Top", ref el.Top, el.Default); @@ -89,7 +90,8 @@ namespace VocaluxeLib.Xml { el = new SThemeCoverGenerator(); bool ok = true; - ok &= TryGetEnumValue(xPath + "/Type", ref el.Type); + string val; + ok &= GetAttribute(xPath, "Type", out val) && Enum.TryParse(val, out el.Type); ok &= Read(xPath + "/Text", out el.Text); ok &= Read(xPath + "/BackgroundColor", out el.BackgroundColor); ok &= GetValue(xPath + "/Image", out el.Image);