From f83b64bdec3f6c7e8dd36eb947ba7b315eb2ba1f Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Mon, 27 Dec 2021 19:35:13 -0800
Subject: [PATCH] Fix AdminSystem not unsubscribing from
 PlayerTab.OnEntryPressed

---
 Content.Client/Administration/AdminSystem.Menu.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Client/Administration/AdminSystem.Menu.cs b/Content.Client/Administration/AdminSystem.Menu.cs
index 947bb3f62e..b71c5fc408 100644
--- a/Content.Client/Administration/AdminSystem.Menu.cs
+++ b/Content.Client/Administration/AdminSystem.Menu.cs
@@ -97,6 +97,8 @@ namespace Content.Client.Administration
 
         public void Close()
         {
+            if (_window != null)
+                _window.PlayerTabControl.OnEntryPressed -= PlayerTabEntryPressed;
             _window?.Close();
 
             foreach (var window in _commandWindows)