From fd92c8f7673dbae38cfe00b0ad50ce39415704d8 Mon Sep 17 00:00:00 2001 From: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> Date: Thu, 30 May 2024 09:27:35 -0600 Subject: [PATCH] [FIX] arm implants with multiple options (toolset, admin arm implant) break if aghosting with radial menu open #25609 (#25640) * Fixes issue #25609 * Refactors `show_radial_menu` to be more concise. * Readability * Removes a possible null case scenario. * ...fixes a rogue menu. --- code/_onclick/hud/radial.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 9a22a2b2891..9a39075b598 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -260,8 +260,9 @@ GLOBAL_LIST_EMPTY(radial_menus) return if(!uniqueid) uniqueid = "defmenu_[user.UID()]_[anchor.UID()]" - - if(GLOB.radial_menus[uniqueid]) + if(GLOB.radial_menus[uniqueid]) // Calls the close button an already existing radial menu. + var/datum/radial_menu/existing_menu = GLOB.radial_menus[uniqueid] + existing_menu.finished = TRUE return var/datum/radial_menu/menu = new