Merge pull request #4167 from Citadel-Station-13/upstream-merge-33153

[MIRROR] Fixes some advanced camera issues
2017-11-30 23:12:26 +00:00
parent 4b25b45701 d649f82df5
commit b2816ce0de
1 changed files with 2 additions and 0 deletions
@@ -43,6 +43,7 @@
 	for(var/V in actions)
 		var/datum/action/A = V
 		A.Remove(user)
+	actions.Cut()
 	if(user.client)
 		user.reset_perspective(null)
 		eyeobj.RemoveImages()
@@ -62,6 +63,7 @@
 		current_user.unset_machine()
 	if(eyeobj)
 		qdel(eyeobj)
+	QDEL_LIST(actions)
 	return ..()

 /obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)