From 216aef40f1df8b5434998593b4a387e52f5b52d7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 26 Mar 2018 04:28:07 -0500 Subject: [PATCH] [MIRROR] Topic will no longer be called on deleted objects (#6100) * Merge pull request #36666 from tgstation/Cyberboss-patch-3 Topic will no longer be called on deleted objects * Topic will no longer be called on deleted objects --- code/modules/client/client_procs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 329c83f366..ff2333cdb4 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -116,6 +116,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if("openLink") src << link(href_list["link"]) + var/datum/real_src = hsrc + if(QDELETED(real_src)) + return + ..() //redirect to hsrc.Topic() /client/proc/is_content_unlocked()