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

themias · Aug 9, 2024 · 0803d89 · 0803d89
1 parent 8f7ed51
commit 0803d89
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -60,13 +60,18 @@ public void OnStateExited(GameplayState state)
 
         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>