Merge pull request #1442 from Citadel-Station-13/upstream-merge-28105

[MIRROR] Fixes logged out spawning new_players
2017-06-06 23:33:35 -05:00
parent cc24b6e3a7 c5143880d2
commit b332506cf2
2 changed files with 4 additions and 4 deletions
@@ -140,8 +140,7 @@
 				observer.name = observer.real_name
 			observer.update_icon()
 			observer.stop_sound_channel(CHANNEL_LOBBYMUSIC)
-			qdel(mind)
-
+			QDEL_NULL(mind)
 			qdel(src)
 			return 1

@@ -352,7 +351,6 @@
 				if(SHUTTLE_CALL)
 					if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5)
 						SSticker.mode.make_antag_chance(humanc)
-	qdel(src)

 /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee)
 	//TODO:  figure out a way to exclude wizards/nukeops/demons from this.
@@ -451,6 +449,8 @@
 	if(.)
 		new_character.key = key		//Manually transfer the key to log them in
 		new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+		new_character = null
+		qdel(src)

 /mob/dead/new_player/proc/ViewManifest()
 	var/dat = "<html><body>"