From 0e02f04a856d3c998041b064f4198c4d7622c9d8 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 11 Sep 2018 21:01:26 -0600 Subject: [PATCH] runelite-client: Don't duplicate chatbox input when widget ids are wrong --- .../src/main/scripts/ChatboxInputHandler.rs2asm | 12 ++++++++++++ .../src/main/scripts/ChatboxInputInit.rs2asm | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm b/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm index f8003ab439..106f53218e 100644 --- a/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm @@ -36,6 +36,18 @@ .int_var_count 2 .string_var_count 1 +; If we are not the active listener, the widget ids have probably changed + get_varc 5 + load_int -2 + if_icmpeq LABEL2 + +; Log the error + load_string "Got input while not active; Widget ids in ChatboxInputInit are probably wrong." + load_string "debug" + runelite_callback + return + +LABEL2: ; Discard zero presses iload 0 load_int 0 diff --git a/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm b/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm index ee2c268184..98a0214baf 100644 --- a/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm @@ -46,6 +46,10 @@ sload 1 put_varc_string 22 +; Mark varcstring22 for our use + load_int -2 + put_varc 5 + ; Set text sload 0 load_int 10616869 ; 162:37