From 8273877b23a44f7e52578173deeef9d8a6f2baa9 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 6 Jun 2017 13:05:38 -0500
Subject: [PATCH] Update holocall.dm

---
 code/datums/holocall.dm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index ccfb39637c..4e7490f8ee 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -1,4 +1,3 @@
-
 #define HOLOPAD_MAX_DIAL_TIME 200
 
 /mob/camera/aiEye/remote/holo/setLoc()
@@ -44,15 +43,22 @@
 
 //cleans up ALL references :)
 /datum/holocall/Destroy()
-	if(!QDELETED(user))
+	QDEL_NULL(hangup)
+
+	var/user_good = !QDELETED(user)
+	if(user_good)
 		user.reset_perspective()
-		if(user.client)
+		user.remote_control = null
+	
+	if(!QDELETED(eye))
+		if(user_good && user.client)
 			for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
 				chunk.remove(eye)
-		user.remote_control = null
-		user = null
-	QDEL_NULL(eye)
-
+		qdel(eye)
+	eye = null
+	
+	user = null
+	
 	if(hologram)
 		hologram.HC = null
 		hologram = null