ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tool manager: more config stuff

This commit is contained in:
goyuken 2014-12-21 05:56:51 +00:00
parent 4d1cd06dcf
commit 3ff57483ff
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.ComponentModel;
using BizHawk.Emulation.Common.IEmulatorExtensions;
using BizHawk.Client.Common;
@ -217,14 +218,18 @@ namespace BizHawk.Client.EmuHawk
object val;
if (data.TryGetValue(prop.Name, out val))
{
try
if (val is string && prop.PropertyType != typeof(string))
{
prop.SetValue(tool, val, null);
}
catch
{
// FIXME
// if a type has a TypeConverter, and that converter can convert to string,
// that will be used in place of object markup by JSON.NET
// but that doesn't work with $type metadata, and JSON.NET fails to fall
// back on regular object serialization when needed. so try to undo a TypeConverter
// operation here
var converter = TypeDescriptor.GetConverter(prop.PropertyType);
val = converter.ConvertFromString((string)val);
}
prop.SetValue(tool, val, null);
}
}