fix anchor for tabcontrol & cancel not working

siblount · Jan 12, 2024 · 5b11dcb · 5b11dcb
1 parent 16ef656
commit 5b11dcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/DAZ_Installer.TestingSuiteWindows/MainForm.Designer.cs b/src/DAZ_Installer.TestingSuiteWindows/MainForm.Designer.cs
diff --git a/src/DAZ_Installer.TestingSuiteWindows/MainForm.cs b/src/DAZ_Installer.TestingSuiteWindows/MainForm.cs
@@ -19,6 +19,7 @@ private record class ProcessSession(DPProcessor Processor, DPArchive Archive, DP
         private Task? lastTask;
         private DPArchive? lastRootArchive;
         ProcessSession? lastSession = null;
+        DPProcessor? currentProcessor = null;
         CancellationTokenSource tokenSource = new();
         public MainForm()
         {
@@ -584,7 +585,7 @@ private void processTask()
             Log.Information("Beginning to process archive.");
             Log.Information("Archive File: {lastRootArchive}", archiveTxtBox.Text);
             Log.Information("Settings to use: \n{@Settings}", JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true }));
-            var processor = new DPProcessor();
+            var processor = currentProcessor = new DPProcessor();
             try
             {
                 processor.ArchiveEnter += (_, a) => arcs.Add(a.Archive);
@@ -600,6 +601,7 @@ private void processTask()
             }
             Log.Information("Finished processing archive.");
             BeginInvoke(treeView1.Nodes.Clear);
+            currentProcessor = null;
             if (arcs.Count == 0) return;
             lastRootArchive = arcs[0];
             lastSession = new(processor, lastRootArchive, this.settings, records);
@@ -671,6 +673,7 @@ private void MainForm_DragDrop(object sender, DragEventArgs e)
 
         private void cancelBtn_Click(object sender, EventArgs e)
         {
+            currentProcessor?.CancelProcessing();
             lastSession?.Processor.CancelProcessing();
             tokenSource.Cancel();
             tokenSource = new();