From c2c04c18a531e34d8a0022b185d8cc7ce9639ef8 Mon Sep 17 00:00:00 2001
From: avabee <40557659+avabee@users.noreply.github.com>
Date: Sun, 16 Dec 2018 22:37:26 -0600
Subject: [PATCH 1/2] Fixes a bug with holographic projectors.
Would not properly null out the variable, meaning it just waits to be garbage collected. Bad. Very bad.
---
code/modules/integrated_electronics/subtypes/output.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 99a6c247a9..ab7773bd6a 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -300,7 +300,7 @@
text_output += "\an [name]"
else
text_output += "\an ["\improper[initial_name]"] labeled '[name]'"
- text_output += " which is currently [get_pin_data(IC_INPUT, 1) ? "lit ¤" : "unlit."]"
+ text_output += " which is currently [get_pin_data(IC_INPUT, 1) ? "lit ¤" : "unlit."]"
to_chat(user,jointext(text_output,null))
/obj/item/integrated_circuit/output/led/red
@@ -462,7 +462,7 @@
/obj/item/integrated_circuit/output/holographic_projector/proc/destroy_hologram()
- hologram.forceMove(src)
+ hologram = null
qdel(hologram)
// holo_beam.End()
From 7e92904386dfa69c1a06c0ff0278215505132994 Mon Sep 17 00:00:00 2001
From: avabee <40557659+avabee@users.noreply.github.com>
Date: Tue, 18 Dec 2018 20:17:18 -0600
Subject: [PATCH 2/2] QDEL_NULL, fixes #5788.
---
code/modules/integrated_electronics/subtypes/output.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index ab7773bd6a..1026ba2633 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -462,8 +462,7 @@
/obj/item/integrated_circuit/output/holographic_projector/proc/destroy_hologram()
- hologram = null
- qdel(hologram)
+ QDEL_NULL(hologram)
// holo_beam.End()
// qdel_null(holo_beam)