From e264e194639a1634c00adc45fb0e71cfec747a36 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:09:56 +0200 Subject: [PATCH] [MIRROR] Don't process topic calls when the ntmessenger program is qdeleted [MDB IGNORE] (#14770) * Don't process topic calls when the ntmessenger program is qdeleted (#68206) * Adds a check for QDELETED in NTmessenger's /Topic() * Don't process topic calls when the ntmessenger program is qdeleted Co-authored-by: oranges --- .../modular_computers/file_system/programs/ntmessenger.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/modular_computers/file_system/programs/ntmessenger.dm b/code/modules/modular_computers/file_system/programs/ntmessenger.dm index dbf8c6a428f..2326b8adb59 100644 --- a/code/modules/modular_computers/file_system/programs/ntmessenger.dm +++ b/code/modules/modular_computers/file_system/programs/ntmessenger.dm @@ -360,7 +360,8 @@ /datum/computer_file/program/messenger/Topic(href, href_list) ..() - + if(QDELETED(src)) + return if(!href_list["close"] && usr.canUseTopic(computer, BE_CLOSE, FALSE, NO_TK)) switch(href_list["choice"]) if("Message")