Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2025-04-02 10:52:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Config: Added version, removed unused flag, fixed crash when xml file is invalid at startup

Browse source
This commit is contained in:
Souryo 2016-02-11 18:37:52 -05:00
parent 63d2c2f9d3
commit cbe8db4524
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
GUI.NET/Config/Configuration.cs
View file

@ -12,6 +12,7 @@ namespace Mesen.GUI.Config
{ {
private const int MaxRecentFiles = 10; private const int MaxRecentFiles = 10;
public string MesenVersion;
public PreferenceInfo PreferenceInfo; public PreferenceInfo PreferenceInfo;
public AudioInfo AudioInfo; public AudioInfo AudioInfo;
public VideoInfo VideoInfo; public VideoInfo VideoInfo;
@ -19,7 +20,6 @@ namespace Mesen.GUI.Config
public List<string> RecentFiles; public List<string> RecentFiles;
public List<CheatInfo> Cheats; public List<CheatInfo> Cheats;
public bool ShowOnlyCheatsForCurrentGame; public bool ShowOnlyCheatsForCurrentGame;
public bool AutoLoadIpsPatches;
public NesModel Region; public NesModel Region;
public ClientConnectionInfo ClientConnectionInfo; public ClientConnectionInfo ClientConnectionInfo;
public ServerInfo ServerInfo; public ServerInfo ServerInfo;
@ -27,6 +27,7 @@ namespace Mesen.GUI.Config
public Configuration() public Configuration()
{ {
MesenVersion = InteropEmu.GetMesenVersion();
Profile = new PlayerProfile(); Profile = new PlayerProfile();
ClientConnectionInfo = new ClientConnectionInfo(); ClientConnectionInfo = new ClientConnectionInfo();
ServerInfo = new ServerInfo(); ServerInfo = new ServerInfo();
@ -68,9 +69,14 @@ namespace Mesen.GUI.Config
public static Configuration Deserialize(string configFile) public static Configuration Deserialize(string configFile)
{ {
Configuration config; Configuration config;
XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration));
using(TextReader textReader = new StreamReader(configFile)) { try {
config = (Configuration)xmlSerializer.Deserialize(textReader); XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration));
using(TextReader textReader = new StreamReader(configFile)) {
config = (Configuration)xmlSerializer.Deserialize(textReader);
}
} catch {
config = new Configuration();
} }
config.InitializeDefaults(); config.InitializeDefaults();