From 2d3ff781cbf3a6e142f06ce5de04ee44bbda957f Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Wed, 2 Aug 2023 14:46:31 +0200 Subject: [PATCH] MainForm.cs - Updated PckManager It now only hides itself when closing --- PCK-Studio/MainForm.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 7afe447c..d8720d99 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -157,6 +157,7 @@ namespace PckStudio private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { + PckManager?.Close(); checkSaveState(); } @@ -962,7 +963,7 @@ namespace PckStudio Debug.WriteLine($"'{file.Filename}' has no data attached.", category: nameof(HandleTextureFile)); return; } - pckFileTypeHandler[file.Filetype]?.Invoke(file); + pckFileTypeHandler[file.Filetype]?.Invoke(file); } } @@ -2257,13 +2258,15 @@ namespace PckStudio private void openPckManagerToolStripMenuItem_Click(object sender, EventArgs e) { PckManager ??= new PckManager(); - PckManager.BringToFront(); - PckManager.Focus(); - if (!PckManager.Visible) + PckManager.FormClosing += (s, e) => { - PckManager.FormClosed += delegate { PckManager = null; }; - PckManager.Show(this); - } + PckManager.Hide(); + e.Cancel = true; + }; + if (!PckManager.Visible) + PckManager.Show(); + if (PckManager.Focus()) + PckManager.BringToFront(); } private async void wavBinkaToolStripMenuItem_Click(object sender, EventArgs e) @@ -2313,7 +2316,7 @@ namespace PckStudio if (exitCode == 0) convertedCount++; - } + } int fileCount = fileDialog.FileNames.Length;