Merge remote-tracking branch 'origin/master' into rustsql

2021-02-21 09:55:36 +08:00
parent 6abad913ff bcffa931b9
commit 0bb5ec3316
27 changed files with 277 additions and 104 deletions
@@ -80,10 +80,12 @@ GLOBAL_PROTECT(mentor_href_token)
 			return
 		var/datum/db_query/query_load_mentors = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor")]")
 		if(!query_load_mentors.Execute())
+			qdel(query_load_mentors)
 			return
 		while(query_load_mentors.NextRow())
 			var/ckey = ckey(query_load_mentors.item[1])
 			new /datum/mentors(ckey)
+		qdel(query_load_mentors)

 // new client var: mentor_datum. Acts the same way holder does towards admin: it holds the mentor datum. if set, the guy's a mentor.
 /client