From 6c958c129a9ce7556a0ff25ec1e4cae73ef1d254 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Tue, 30 May 2017 14:44:25 -0500
Subject: [PATCH] Fixes another holocall runtime

---
 code/datums/holocall.dm     |  5 +++--
 code/datums/holocall.dm.rej | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 code/datums/holocall.dm.rej

diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index a3157e6514..b125f3f502 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -44,11 +44,12 @@
 //cleans up ALL references :)
 /datum/holocall/Destroy()
 	user.reset_perspective()
-	if(user.client)
+	if(!QDELETED(eye) && user.client)
 		for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
 			chunk.remove(eye)
+		qdel(eye)
+	eye = null
 	user.remote_control = null
-	QDEL_NULL(eye)
 	
 	user = null
 	if(hologram)
diff --git a/code/datums/holocall.dm.rej b/code/datums/holocall.dm.rej
new file mode 100644
index 0000000000..8b39f40ba9
--- /dev/null
+++ b/code/datums/holocall.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/datums/holocall.dm b/code/datums/holocall.dm	(rejected hunks)
+@@ -45,7 +45,7 @@
+ 	var/user_good = !QDELETED(user)
+ 	if(user_good)
+ 		user.reset_perspective()
+-    	user.remote_control = null
++		user.remote_control = null
+ 	
+ 	if(!QDELETED(eye))
+ 		if(user_good && user.client)