From adfc4dbf7057c3e07f455e8d332046b1bcae515b Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Wed, 27 Nov 2019 15:33:51 +0000
Subject: [PATCH] Fix pAI preferences not loading

---
 code/modules/client/preference_setup/global/03_pai.dm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/client/preference_setup/global/03_pai.dm b/code/modules/client/preference_setup/global/03_pai.dm
index 8e0b4ea8a5..01c5f7a850 100644
--- a/code/modules/client/preference_setup/global/03_pai.dm
+++ b/code/modules/client/preference_setup/global/03_pai.dm
@@ -7,11 +7,16 @@
 /datum/category_item/player_setup_item/player_global/pai/load_preferences(var/savefile/S)
 	if(!candidate)
 		candidate = new()
-
-	if(!preference_mob())
+	var/preference_mob = preference_mob()
+	if(!preference_mob)// No preference mob - this happens when we're called from client/New() before it calls ..()  (via datum/preferences/New())
+		spawn()
+			preference_mob = preference_mob()
+			if(!preference_mob)
+				return
+			candidate.savefile_load(preference_mob)
 		return
 
-	candidate.savefile_load(preference_mob())
+	candidate.savefile_load(preference_mob)
 
 /datum/category_item/player_setup_item/player_global/pai/save_preferences(var/savefile/S)
 	if(!candidate)