diff --git a/BizHawk.MultiClient/ConfigService.cs b/BizHawk.MultiClient/ConfigService.cs index 86956dcd05..bdf9f850ef 100644 --- a/BizHawk.MultiClient/ConfigService.cs +++ b/BizHawk.MultiClient/ConfigService.cs @@ -18,7 +18,7 @@ namespace BizHawk.MultiClient if (file.Exists) using (var reader = file.OpenText()) { - var s = new JsonSerializer {SuppressMissingMemberException = true}; + var s = new JsonSerializer {SuppressMissingMemberException = true, SuppressDuplicateMemberException = true}; var r = new JsonReader(reader); config = (T)s.Deserialize(r, typeof(T)); } diff --git a/Json.net.1.3.1.modified-source.rar b/Json.net.1.3.1.modified-source.rar index 824ed1dec4..2d4d91e2f8 100644 Binary files a/Json.net.1.3.1.modified-source.rar and b/Json.net.1.3.1.modified-source.rar differ diff --git a/Newtonsoft.Json.dll b/Newtonsoft.Json.dll index 0c3218e0e8..0985c864f6 100644 Binary files a/Newtonsoft.Json.dll and b/Newtonsoft.Json.dll differ