Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119

[MIRROR] Fixes uplink_purchase_log GC error
2018-01-08 04:14:04 +00:00
parent 457f6de178 3c1d44e591
commit b18d720730
1 changed files with 2 additions and 0 deletions
@@ -20,6 +20,8 @@ GLOBAL_LIST(uplink_purchase_logs_by_key)	//assoc key = /datum/uplink_purchase_lo
 /datum/uplink_purchase_log/Destroy()
 	purchase_log = null
 	parent = null
+	if(GLOB.uplink_purchase_logs_by_key[owner] == src)
+		GLOB.uplink_purchase_logs_by_key -= owner
 	return ..()

 /datum/uplink_purchase_log/proc/MergeWithAndDel(datum/uplink_purchase_log/other)