From a13bdc04311c47a1096f5bf0d9f1ce3995695010 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:26:02 +0100
Subject: [PATCH] Fix AHelp window being recentered when opened through the
 verb (#14219)

---
 .../Systems/Bwoink/AHelpUIController.cs       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 2e1f86acd4..21b3c9d0ff 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -253,6 +253,17 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
         Control?.OnBwoink(message.UserId);
     }
 
+    private void OpenWindow()
+    {
+        if (Window == null)
+            return;
+
+        if (EverOpened)
+            Window.Open();
+        else
+            Window.OpenCentered();
+    }
+
     public void Close()
     {
         Window?.Close();
@@ -282,18 +293,9 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
         EnsurePanel(_ownerId);
 
         if (IsOpen)
-        {
             Close();
-        }
         else
-        {
-            if (EverOpened)
-                Window!.Open();
-            else
-                Window!.OpenCentered();
-
-            EverOpened = true;
-        }
+            OpenWindow();
     }
 
     public event Action? OnClose;
@@ -303,7 +305,7 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
     public void Open(NetUserId channelId)
     {
         SelectChannel(channelId);
-        Window?.OpenCentered();
+        OpenWindow();
     }
 
     public void OnRequestClosed(WindowRequestClosedEventArgs args)
-- 
2.52.0