diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm index 66f391b95e3..7db7a59c7a1 100644 --- a/code/controllers/subsystems/garbage.dm +++ b/code/controllers/subsystems/garbage.dm @@ -347,6 +347,12 @@ SUBSYSTEM_DEF(garbage) /// Datums passed to this will be given a chance to clean up references to allow the GC to collect them. /proc/qdel(datum/to_delete, force = FALSE) if(!istype(to_delete)) + if(isnull(to_delete)) + return + else if(islist(to_delete)) + stack_trace("Lists should not be directly passed to qdel! You likely want either list.Cut(), QDEL_LIST(list), QDEL_LIST_ASSOC(list), or QDEL_LIST_ASSOC_VAL(list)") + else if(to_delete != world) + stack_trace("Tried to qdel possibly invalid value: [to_delete]") del(to_delete) return diff --git a/code/game/objects/structures/carts/engicart.dm b/code/game/objects/structures/carts/engicart.dm index 45091b85eab..d53e3fec37a 100644 --- a/code/game/objects/structures/carts/engicart.dm +++ b/code/game/objects/structures/carts/engicart.dm @@ -75,9 +75,9 @@ update_icon() /obj/structure/cart/storage/engineeringcart/Destroy() - QDEL_NULL(my_glass) - QDEL_NULL(my_metal) - QDEL_NULL(my_plasteel) + QDEL_LIST(my_glass) + QDEL_LIST(my_metal) + QDEL_LIST(my_plasteel) QDEL_NULL(my_lightreplacer) QDEL_NULL(my_blue_toolbox) QDEL_NULL(my_yellow_toolbox) diff --git a/code/game/objects/structures/carts/parcelcart.dm b/code/game/objects/structures/carts/parcelcart.dm index d379950735d..d1c4cd000e0 100644 --- a/code/game/objects/structures/carts/parcelcart.dm +++ b/code/game/objects/structures/carts/parcelcart.dm @@ -36,7 +36,7 @@ update_icon() /obj/structure/cart/storage/parcelcart/Destroy() - QDEL_NULL(my_parcels) + QDEL_LIST(my_parcels) return ..() /obj/structure/cart/storage/parcelcart/attackby(obj/item/attacking_item, mob/user) diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 405a815a414..1192bb55b85 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -81,7 +81,8 @@ /datum/tgui_list_input/Destroy(force, ...) SStgui.close_uis(src) - QDEL_NULL(items) + items?.Cut() + items_map?.Cut() return ..() /** diff --git a/html/changelogs/johnwildkins-qdel.yml b/html/changelogs/johnwildkins-qdel.yml new file mode 100644 index 00000000000..ef478a1e0fc --- /dev/null +++ b/html/changelogs/johnwildkins-qdel.yml @@ -0,0 +1,14 @@ +# Your name. +author: JohnWildkins + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - code_imp: "Add check to qdel() to prevent attempts to qdel lists." + - bugfix: "Fix bad qdels on tgui list inputs and engicarts. Minor performance increase."