From 86c472eaf60f6d7283bf4edc74f356f7b81d8d98 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Fri, 7 Feb 2020 03:17:00 +0100
Subject: [PATCH] the holopad fix.

---
 code/datums/holocall.dm                         | 12 ++++++------
 code/game/machinery/computer/camera_advanced.dm |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 72fe6f5a1c..e0b0072808 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -12,7 +12,12 @@
 /mob/camera/aiEye/remote/holo/setLoc()
 	. = ..()
 	var/obj/machinery/holopad/H = origin
-	H.move_hologram(eye_user, loc)
+	H?.move_hologram(eye_user, loc)
+
+/obj/machinery/holopad/remove_eye_control(mob/living/user)
+	if(user.client)
+		user.reset_perspective(null)
+	user.remote_control = null
 
 //this datum manages it's own references
 
@@ -54,11 +59,6 @@
 /datum/holocall/Destroy()
 	QDEL_NULL(hangup)
 
-	var/user_good = !QDELETED(user)
-	if(user_good)
-		user.reset_perspective()
-		user.remote_control = null
-
 	if(!QDELETED(eye))
 		QDEL_NULL(eye)
 
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 8de470fdb8..e5ac9a0f78 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -47,7 +47,10 @@
 		jump_action.Grant(user)
 		actions += jump_action
 
-/obj/machinery/computer/camera_advanced/proc/remove_eye_control(mob/living/user)
+/obj/machinery/proc/remove_eye_control(mob/living/user)
+	CRASH("[type] does not implement ai eye handling")
+
+/obj/machinery/computer/camera_advanced/remove_eye_control(mob/living/user)
 	if(!user)
 		return
 	for(var/V in actions)
@@ -157,7 +160,7 @@
 	var/cooldown = 0
 	var/acceleration = 1
 	var/mob/living/eye_user = null
-	var/obj/machinery/computer/camera_advanced/origin
+	var/obj/machinery/origin
 	var/eye_initialized = 0
 	var/visible_icon = 0
 	var/image/user_image = null
@@ -170,7 +173,7 @@
 
 /mob/camera/aiEye/remote/Destroy()
 	if(origin && eye_user)
-		origin.remove_eye_control(eye_user)
+		origin.remove_eye_control(eye_user,src)
 	origin = null
 	. = ..()
 	eye_user = null