From ddbb24e271d61bf7fa071f927ea31d52a66c8888 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 26 Jul 2021 14:14:06 -0400 Subject: [PATCH 1/2] Merge pull request #11257 from VOREStation/Arokha/sani Attempt to further fix missing languages --- code/controllers/subsystems/character_setup.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystems/character_setup.dm b/code/controllers/subsystems/character_setup.dm index 36851b26d4..fdad93fbbb 100644 --- a/code/controllers/subsystems/character_setup.dm +++ b/code/controllers/subsystems/character_setup.dm @@ -28,7 +28,10 @@ SUBSYSTEM_DEF(character_setup) var/datum/preferences/prefs = save_queue[save_queue.len] save_queue.len-- - if(!QDELETED(prefs)) + // Can't save prefs without client, because the sanitize functions will be + // unable to validate their whitelist status due to being unable to check + // 'holder' admin status, etc. Will result in Bad Times. + if(!QDELETED(prefs) && prefs.client) prefs.save_preferences() if(MC_TICK_CHECK)