From d0e5a38c290ece0bc5d2fc6612be5d884dcd6ed8 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 31 Dec 2017 10:58:22 -0500
Subject: [PATCH] Merge pull request #33954 from jammer312/components_fix

fixes component's dupe
---
 code/datums/components/_component.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index fcd4651459..46ffc25643 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -205,13 +205,13 @@
 						new_comp = new nt(arglist(args))
 					if(!QDELETED(new_comp))
 						old_comp.InheritComponent(new_comp, TRUE)
-						qdel(new_comp)
+						QDEL_NULL(new_comp)
 				if(COMPONENT_DUPE_HIGHLANDER)
 					if(!new_comp)
 						new_comp = new nt(arglist(args))
 					if(!QDELETED(new_comp))
 						new_comp.InheritComponent(old_comp, FALSE)
-						qdel(old_comp)
+						QDEL_NULL(old_comp)
 				if(COMPONENT_DUPE_UNIQUE_PASSARGS)
 					if(!new_comp)
 						var/list/arguments = args.Copy(2)