Merge branch 'release-0.3' into develop
Conflicts: Vocaluxe/Base/CConfig.cs Vocaluxe/Lib/Playlist/CPlaylistFile.cs Vocaluxe/Screens/CScreenSong.cs VocaluxeLib/CHelper.cs VocaluxeLib/Menu/CMenu.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
This commit is contained in:
commit
73e4a9fa74
15 files changed
+240
-272
No files matched your search
@@ -24,13 +24,6 @@ namespace VocaluxeLib.Profile
|
||||
{
|
||||
public class CProfile
|
||||
{
|
||||
private static readonly XmlWriterSettings _Settings = new XmlWriterSettings
|
||||
{
|
||||
Indent = true,
|
||||
Encoding = Encoding.UTF8,
|
||||
ConformanceLevel = ConformanceLevel.Document
|
||||
};
|
||||
|
||||
public int ID;
|
||||
|
||||
public string PlayerName;
|
||||
@@ -137,7 +130,7 @@ namespace VocaluxeLib.Profile
|
||||
XmlWriter writer;
|
||||
try
|
||||
{
|
||||
writer = XmlWriter.Create(Path.Combine(FilePath, FileName), _Settings);
|
||||
writer = XmlWriter.Create(Path.Combine(FilePath, FileName), CBase.Config.GetXMLSettings());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user