aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/ModLoader.cs
diff options
context:
space:
mode:
authorMary <1760003+Thog@users.noreply.github.com>2021-07-13 16:48:54 +0200
committerMary <1760003+Thog@users.noreply.github.com>2021-07-13 16:48:54 +0200
commit208ba1dde2b9a4d31446ace2bba8f0d641d2e300 (patch)
treec7478e7eb87061400bab37daf4f2f69cf387d9f2 /Ryujinx.HLE/HOS/ModLoader.cs
parent997380d48cb3b74e2438cee7fc3b017d6b59b714 (diff)
Revert LibHac update
Users are facing save destruction on failing extra data update apparently
Diffstat (limited to 'Ryujinx.HLE/HOS/ModLoader.cs')
-rw-r--r--Ryujinx.HLE/HOS/ModLoader.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/ModLoader.cs b/Ryujinx.HLE/HOS/ModLoader.cs
index d09e837d..a2e9af18 100644
--- a/Ryujinx.HLE/HOS/ModLoader.cs
+++ b/Ryujinx.HLE/HOS/ModLoader.cs
@@ -3,7 +3,6 @@ using LibHac.Fs;
using LibHac.Fs.Fsa;
using LibHac.FsSystem;
using LibHac.FsSystem.RomFs;
-using LibHac.Loader;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.Loaders.Mods;
@@ -13,6 +12,7 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.IO;
+using Ryujinx.HLE.Loaders.Npdm;
using Ryujinx.HLE.HOS.Kernel.Process;
using System.Globalization;
@@ -522,7 +522,7 @@ namespace Ryujinx.HLE.HOS
{
public BitVector32 Stubs;
public BitVector32 Replaces;
- public MetaLoader Npdm;
+ public Npdm Npdm;
public bool Modified => (Stubs.Data | Replaces.Data) != 0;
}
@@ -582,10 +582,9 @@ namespace Ryujinx.HLE.HOS
continue;
}
- modLoadResult.Npdm = new MetaLoader();
- modLoadResult.Npdm.Load(File.ReadAllBytes(npdmFile.FullName));
+ modLoadResult.Npdm = new Npdm(npdmFile.OpenRead());
- Logger.Info?.Print(LogClass.ModLoader, "main.npdm replaced");
+ Logger.Info?.Print(LogClass.ModLoader, $"main.npdm replaced");
}
}