From 7c9360d39353db38a8b5c5ff9c52924a577f089e Mon Sep 17 00:00:00 2001 From: Mary Date: Tue, 30 Nov 2021 11:09:32 +0100 Subject: [PATCH] Fix Amiibo hanging since .NET 6 changes (#2890) The .NET 6 changes ended up causing a difference in the way we deserialise and would end up deserializing wrongly. This commit fixes it by resoring previous behaviour while still fixing the illink warning that caused that change in the first place --- Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs index 3eb88950a..35aeade06 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs @@ -1,6 +1,5 @@ using Ryujinx.Common.Configuration; using Ryujinx.Common.Memory; -using Ryujinx.Common.Utilities; using Ryujinx.HLE.HOS.Services.Mii; using Ryujinx.HLE.HOS.Services.Mii.Types; using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager; @@ -173,7 +172,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp if (File.Exists(filePath)) { - virtualAmiiboFile = JsonHelper.DeserializeFromFile(filePath); + virtualAmiiboFile = JsonSerializer.Deserialize(File.ReadAllText(filePath), new JsonSerializerOptions(JsonSerializerDefaults.General)); } else {