From 564dbf2e578fca64d79bf22155b37d38067e6f08 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 19 Jun 2024 00:02:25 -0400 Subject: [PATCH] Fix load button bugs --- RecodeItGUI/GUI/Main.cs | 2 ++ RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/RecodeItGUI/GUI/Main.cs b/RecodeItGUI/GUI/Main.cs index 43f5ee9..044205a 100644 --- a/RecodeItGUI/GUI/Main.cs +++ b/RecodeItGUI/GUI/Main.cs @@ -275,6 +275,8 @@ public partial class ReCodeItForm : Form DataProvider.LoadMappingFile(result); AppSettings.Remapper.MappingPath = result; + AppSettings.Remapper.UseProjectMappings = false; + ActiveProjectMappingsCheckbox.Checked = false; DataProvider.SaveAppSettings(); LoadedMappingFilePath.Text = result; diff --git a/RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs b/RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs index d031944..25eb14f 100644 --- a/RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs +++ b/RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs @@ -24,7 +24,12 @@ public class ReCodeItCrossCompiler public void StartRemap() { ChangedTypes.Clear(); - Remapper.InitializeRemap(ActiveProject.OriginalAssemblyPath, ActiveProject.RemappedAssemblyPath, true); + + Remapper.InitializeRemap( + ActiveProject.RemapModels, + ActiveProject.OriginalAssemblyPath, + ActiveProject.RemappedAssemblyPath, + true); if (ActiveProject == null) {