From a9a336595a07383e86f1123355a6a55a59b84258 Mon Sep 17 00:00:00 2001
From: Acruid <shatter66@gmail.com>
Date: Sat, 27 Feb 2021 02:50:02 -0800
Subject: [PATCH] ConstructionMenu now properly unsubscribes from the keybind
 open event on the ConstructionSystem. This bug was previously causing an
 invisible disposed window to open back up after round start when pressing G,
 throwing exceptions and blocking mouse input.

---
 Content.Client/Construction/ConstructionMenu.xaml.cs     | 8 --------
 Content.Client/Construction/ConstructionMenuPresenter.cs | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Content.Client/Construction/ConstructionMenu.xaml.cs b/Content.Client/Construction/ConstructionMenu.xaml.cs
index 70428b8fdb..889e652ba7 100644
--- a/Content.Client/Construction/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/ConstructionMenu.xaml.cs
@@ -135,13 +135,5 @@ namespace Content.Client.Construction
             TargetTexture.Texture = null;
             StepList.Clear();
         }
-
-        /// <inheritdoc />
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing) { }
-        }
     }
 }
diff --git a/Content.Client/Construction/ConstructionMenuPresenter.cs b/Content.Client/Construction/ConstructionMenuPresenter.cs
index 39e9ea67d6..c89544031d 100644
--- a/Content.Client/Construction/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/ConstructionMenuPresenter.cs
@@ -123,6 +123,7 @@ namespace Content.Client.Construction
         {
             _constructionView.Dispose();
 
+            SystemBindingChanged(null);
             _systemManager.SystemLoaded -= OnSystemLoaded;
             _systemManager.SystemUnloaded -= OnSystemUnloaded;