diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 47fe9d55b..b4e77ae71 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -392,6 +392,12 @@ private void MainMenuBoxLoad(object sender, EventArgs e) /// private void MainMenuBoxDump(object sender, EventArgs e) { + if (Application.OpenForms.OfType().FirstOrDefault() is { } open) + { + open.Focus(); + return; + } + DialogResult ld = WinFormsUtil.Prompt(MessageBoxButtons.YesNo, MsgDatabaseExport); if (ld == DialogResult.Yes) { @@ -401,15 +407,21 @@ private void MainMenuBoxDump(object sender, EventArgs e) if (ld != DialogResult.No) return; - using var dumper = new BoxExporter(C_SAV.SAV, BoxExporter.ExportOverride.All); - dumper.ShowDialog(); + var dumper = new BoxExporter(C_SAV.SAV, BoxExporter.ExportOverride.All) { Owner = this }; + dumper.Show(); } private void MainMenuBoxDumpSingle(object sender, EventArgs e) { + if (Application.OpenForms.OfType().FirstOrDefault() is { } open) + { + open.Focus(); + return; + } + C_SAV.SAV.CurrentBox = C_SAV.CurrentBox; // double check - using var dumper = new BoxExporter(C_SAV.SAV, BoxExporter.ExportOverride.Current); - dumper.ShowDialog(); + var dumper = new BoxExporter(C_SAV.SAV, BoxExporter.ExportOverride.Current) { Owner = this }; + dumper.Show(); } private void MainMenuBatchEditor(object sender, EventArgs e) diff --git a/PKHeX.WinForms/Subforms/BoxExporter.cs b/PKHeX.WinForms/Subforms/BoxExporter.cs index 7338b4413..3e67b0750 100644 --- a/PKHeX.WinForms/Subforms/BoxExporter.cs +++ b/PKHeX.WinForms/Subforms/BoxExporter.cs @@ -32,6 +32,7 @@ public BoxExporter(SaveFile sav, ExportOverride eo = ExportOverride.None) if (name == obj.DefaultBoxExportNamer) index = i; } + CenterToParent(); CB_Namer.SelectedIndex = index; }