From ed8a1bafb1cb7ffcd6be4a08778bc163e725c2d7 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Wed, 15 Mar 2017 21:02:09 -0400 Subject: [PATCH] Fair enough I suppose --- code/controllers/failsafe.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 262e6d98dcd..4c374c18284 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -33,13 +33,11 @@ var/datum/controller/failsafe/Failsafe /datum/controller/failsafe/Initialize() set waitfor = 0 Failsafe.Loop() - running = FALSE - qdel(Failsafe) //when Loop() returns, we delete ourselves and let the mc recreate us + if(!QDELETED(src)) + qdel(Failsafe) //when Loop() returns, we delete ourselves and let the mc recreate us /datum/controller/failsafe/Destroy() - if(running) - running = FALSE - return QDEL_HINT_LETMELIVE + running = FALSE ..() return QDEL_HINT_HARDDEL_NOW