From 16d2dfe33377c8192153a575ac9e4e58d9754da9 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 24 Feb 2018 17:19:49 -0500 Subject: [PATCH] Fix commlink runtime Probably when NIF is being destroyed. --- code/modules/nifsoft/software/14_commlink.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 158846ebcc4..c7cfcfde699 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -14,8 +14,9 @@ nif.comm = new(nif,src) uninstall() - if((. = ..())) - qdel_null(nif.comm) + var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. + if((. = ..()) && lnif) + qdel_null(lnif.comm) activate() if((. = ..()))