fix manual window failing if opened twice thanks to CMDR NeedX

This commit is contained in:
Florian Stinglmayr 2022-04-06 16:15:03 +02:00
parent 1aeb5a09e0
commit d087c1862a

View File

@ -29,7 +29,7 @@ namespace EliteBGS {
public Report Report => report; public Report Report => report;
private LoadEntriesWindow loadentries = new LoadEntriesWindow(); private LoadEntriesWindow loadentries = null;
private static readonly List<DiscordLogGenerator> logtypes = new List<DiscordLogGenerator>() { private static readonly List<DiscordLogGenerator> logtypes = new List<DiscordLogGenerator>() {
new NonaDiscordLog(), new NonaDiscordLog(),
@ -45,8 +45,6 @@ namespace EliteBGS {
/* ignored */ /* ignored */
} }
loadentries.EntriesLoaded += Loadentries_EntriesLoaded;
report.OnLog += Report_OnLog; report.OnLog += Report_OnLog;
foreach (DiscordLogGenerator type in logtypes) { foreach (DiscordLogGenerator type in logtypes) {
@ -338,11 +336,24 @@ namespace EliteBGS {
} }
private void ManuallyParse_Click(object sender, RoutedEventArgs e) { private void ManuallyParse_Click(object sender, RoutedEventArgs e) {
if (loadentries != null) {
loadentries.Show();
return;
}
loadentries = new LoadEntriesWindow();
loadentries.Closed += Loadentries_Closed;
loadentries.EntriesLoaded += Loadentries_EntriesLoaded;
loadentries.Show(); loadentries.Show();
} }
private void Loadentries_Closed(object sender, EventArgs e) {
loadentries = null;
}
private void window_Closing(object sender, System.ComponentModel.CancelEventArgs e) { private void window_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
loadentries.Close(); loadentries?.Close();
loadentries = null;
} }
} }
} }