From 40cbc88c1d469a2040d209994f14372b5f515e9f Mon Sep 17 00:00:00 2001 From: yck1509 Date: Fri, 9 Oct 2015 17:43:38 +0800 Subject: [PATCH] Fix modified project when loading a project with packer --- Confuser.Protections/Compress/Compressor.cs | 2 +- ConfuserEx/ViewModel/UI/SettingsTabVM.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Confuser.Protections/Compress/Compressor.cs b/Confuser.Protections/Compress/Compressor.cs index 3d8eb1d82..06cebe61d 100644 --- a/Confuser.Protections/Compress/Compressor.cs +++ b/Confuser.Protections/Compress/Compressor.cs @@ -306,7 +306,7 @@ public void OnWriterEvent(ModuleWriterBase writer, ModuleWriterEvent evt) { ctx.KeyToken = sigToken; MutationHelper.InjectKey(writer.Module.EntryPoint, 2, (int)sigToken); } - else if (evt == ModuleWriterEvent.MDBeginAddResources) { + else if (evt == ModuleWriterEvent.MDBeginAddResources && !ctx.CompatMode) { // Compute hash byte[] hash = SHA1.Create().ComputeHash(ctx.OriginModule); uint hashBlob = writer.MetaData.BlobHeap.Add(hash); diff --git a/ConfuserEx/ViewModel/UI/SettingsTabVM.cs b/ConfuserEx/ViewModel/UI/SettingsTabVM.cs index 104f2a429..e6509c820 100644 --- a/ConfuserEx/ViewModel/UI/SettingsTabVM.cs +++ b/ConfuserEx/ViewModel/UI/SettingsTabVM.cs @@ -94,9 +94,9 @@ void InitProject() { protected override void OnPropertyChanged(string property) { if (property == "HasPacker") { - if (hasPacker) + if (hasPacker && App.Project.Packer == null) App.Project.Packer = new ProjectSettingVM(App.Project, new SettingItem { Id = App.Project.Packers[0].Id }); - else + else if (!hasPacker) App.Project.Packer = null; } base.OnPropertyChanged(property);