From 8a4d6172b2e15b78b9321d79bc691577f97fa087 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 8 Jul 2019 17:12:06 -0400 Subject: [PATCH] keyremapping: fix escape from chat triggering game keybindings Co-authored-by: Chet Powers --- .../client/plugins/keyremapping/KeyRemappingListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java index 56cf3bbedc..a6ad6e8638 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java @@ -190,8 +190,12 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener { switch (e.getKeyCode()) { - case KeyEvent.VK_ENTER: case KeyEvent.VK_ESCAPE: + // When existing typing mode, block the escape key + // so that it doesn't trigger the in-game hotkeys + e.consume(); + // FALLTHROUGH + case KeyEvent.VK_ENTER: plugin.setTyping(false); clientThread.invoke(plugin::lockChat); break;