From d087c1862acd08fd77afc73b40c3e40242a7f6f6 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Wed, 6 Apr 2022 16:15:03 +0200
Subject: [PATCH] fix manual window failing if opened twice thanks to CMDR
 NeedX

---
 MainWindow.xaml.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 86b01d3..529cb55 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -29,7 +29,7 @@ namespace EliteBGS {
 
         public Report Report => report;
 
-        private LoadEntriesWindow loadentries = new LoadEntriesWindow();
+        private LoadEntriesWindow loadentries = null;
 
         private static readonly List<DiscordLogGenerator> logtypes = new List<DiscordLogGenerator>() {
             new NonaDiscordLog(),
@@ -45,8 +45,6 @@ namespace EliteBGS {
                 /* ignored */
             }
 
-            loadentries.EntriesLoaded += Loadentries_EntriesLoaded;
-
             report.OnLog += Report_OnLog;
 
             foreach (DiscordLogGenerator type in logtypes) {
@@ -338,11 +336,24 @@ namespace EliteBGS {
         }
 
         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();
         }
 
+        private void Loadentries_Closed(object sender, EventArgs e) {
+            loadentries = null;
+        }
+
         private void window_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
-            loadentries.Close();
+            loadentries?.Close();
+            loadentries = null;
         }
     }
 }