From 9c1f0a2ab38a2f3192d7482099db87fefbddec15 Mon Sep 17 00:00:00 2001 From: TiviPlus <57223640+TiviPlus@users.noreply.github.com> Date: Mon, 26 May 2025 15:25:47 +0200 Subject: [PATCH] Fix mousepos runtime with esc (#91237) ## About The Pull Request esc manually calls keyup without mousepos ## Changelog :cl: fix: fixed a runtime error with the escape menu /:cl: --------- Co-authored-by: TiviPlus <572233640+TiviPlus@users.noreply.com> --- code/modules/keybindings/bindings_client.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index d9a5effd104..a53d5b9410f 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -101,13 +101,15 @@ calculate_move_dir() if(!movement_locked && !(next_move_dir_add & movement)) next_move_dir_sub |= movement - - var/list/click_data = get_loc_from_mousepos(mousepos_x, mousepos_y, sizex, sizey, src) + var/list/click_data + //manual calls of keyup + if(mousepos_x && mousepos_y) + click_data = get_loc_from_mousepos(mousepos_x, mousepos_y, sizex, sizey, src) // We don't do full key for release, because for mod keys you // can hold different keys and releasing any should be handled by the key binding specifically for (var/kb_name in prefs.key_bindings_by_key[_key]) var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name] - if(kb.can_use(src) && kb.up(src, click_data[1])) + if(kb.can_use(src) && kb.up(src, click_data?[1])) break holder?.key_up(_key, src) mob.focus?.key_up(_key, src)