Fix modified project when loading a project with packer

yck1509 · Oct 9, 2015 · 40cbc88 · 40cbc88
1 parent 469682c
commit 40cbc88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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<Packer>(App.Project, new SettingItem<Packer> { Id = App.Project.Packers[0].Id });
-				else
+				else if (!hasPacker)
 					App.Project.Packer = null;
 			}
 			base.OnPropertyChanged(property);