From a239a7873fbd3a67bea2fb6cba4c43b1e652ad64 Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 9 Jul 2022 07:03:16 +1200 Subject: [PATCH] Don't assume computers and applications still exist when broadcasting (#68207) subspace messages --- code/game/machinery/telecomms/machines/message_server.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index bba8fa1494e..ef10ad4c7c8 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -180,9 +180,11 @@ if (!logged) // Can only go through if a message server logs it return for (var/obj/item/modular_computer/comp in data["targets"]) - var/obj/item/computer_hardware/hard_drive/drive = comp.all_components[MC_HDD] - for(var/datum/computer_file/program/messenger/app in drive.stored_files) - app.receive_message(src) + if(!QDELETED(comp)) + var/obj/item/computer_hardware/hard_drive/drive = comp.all_components[MC_HDD] + for(var/datum/computer_file/program/messenger/app in drive.stored_files) + if(!QDELETED(app)) + app.receive_message(src) // Request Console signal datum /datum/signal/subspace/messaging/rc/broadcast()