From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 4 Aug 2024 05:35:02 +0000 (+1000)
Subject: Fix verbs in mapping state (#30631)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c3c5a6ba2295af83b3df43a8f1370060adcd93db;p=space-station-14.git

Fix verbs in mapping state (#30631)
---

diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
index 1bbf44ac2c..ad120da80b 100644
--- a/Content.Client/Verbs/UI/VerbMenuUIController.cs
+++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -60,13 +60,18 @@ namespace Content.Client.Verbs.UI
 
         public void OnStateEntered(MappingState state)
         {
+            _context.OnContextKeyEvent += OnKeyBindDown;
+            _context.OnContextClosed += Close;
             _verbSystem.OnVerbsResponse += HandleVerbsResponse;
         }
 
         public void OnStateExited(MappingState state)
         {
+            _context.OnContextKeyEvent -= OnKeyBindDown;
+            _context.OnContextClosed -= Close;
             if (_verbSystem != null)
                 _verbSystem.OnVerbsResponse -= HandleVerbsResponse;
+            Close();
         }
 
         /// <summary>