From b5646116976ac303c37819f8c192b0a50c96742e Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Thu, 16 Jun 2022 07:39:59 -0700
Subject: [PATCH] Fix shutdown

---
 BeefTools/BeefPerf/src/BPApp.bf | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/BeefTools/BeefPerf/src/BPApp.bf b/BeefTools/BeefPerf/src/BPApp.bf
index 9cd36fa7..2b255562 100644
--- a/BeefTools/BeefPerf/src/BPApp.bf
+++ b/BeefTools/BeefPerf/src/BPApp.bf
@@ -262,6 +262,15 @@ namespace BeefPerf
 		{
 			base.Stop();
 			mListenSocket.Close();
+
+			Widget.RemoveAndDelete(mWorkspacePanel);
+			mWorkspacePanel = null;
+			Widget.RemoveAndDelete(mBoard);
+			mBoard = null;
+			Widget.RemoveAndDelete(mProfilePanel);
+			mProfilePanel = null;
+			Widget.RemoveAndDelete(mFindPanel);
+			mFindPanel = null;
 		}
 		
 		void ShowWorkspacePanel()
@@ -512,16 +521,6 @@ namespace BeefPerf
 		public override void Shutdown()
 		{
 			base.Shutdown();
-
-			Widget.RemoveAndDelete(mWorkspacePanel);
-			mWorkspacePanel = null;
-			Widget.RemoveAndDelete(mBoard);
-			mBoard = null;
-			Widget.RemoveAndDelete(mProfilePanel);
-			mProfilePanel = null;
-			Widget.RemoveAndDelete(mFindPanel);
-			mFindPanel = null;
-
 			mShutdownEvent.Set(true);
 		}