From 6b8c808fcc79ffe922f22381ba68f983ea72ea06 Mon Sep 17 00:00:00 2001 From: Karolis Date: Sat, 27 Jul 2019 20:46:18 +0300 Subject: [PATCH] Fixes maniquin caused runtimes (#6784) --- code/controllers/subsystems/records.dm | 4 ++-- code/modules/vueui/ui.dm | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm index d98ecaaee07..25cfff603ca 100644 --- a/code/controllers/subsystems/records.dm +++ b/code/controllers/subsystems/records.dm @@ -225,9 +225,9 @@ * Helping functions for everyone */ /proc/GetAssignment(var/mob/living/carbon/human/H) - if(H.mind.role_alt_title) + if(H.mind?.role_alt_title) return H.mind.role_alt_title - else if(H.mind.assigned_role) + else if(H.mind?.assigned_role) return H.mind.assigned_role else if(H.job) return H.job diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm index ffd87dff116..2c169a38136 100644 --- a/code/modules/vueui/ui.dm +++ b/code/modules/vueui/ui.dm @@ -281,6 +281,8 @@ main ui datum. * @return nothing */ /datum/vueui/proc/check_for_change(var/force = 0) + if(!user.client) + return if(status > STATUS_DISABLED) var/ret = object.vueui_data_change(data, user, src) if(ret) @@ -323,7 +325,7 @@ main ui datum. * @return nothing */ /datum/vueui/process() - if (!object || !user || status < 0) + if (!object || !user || status < 0 || !user.client) close() return update_status()