From 6d1bb9ebce13fd3294d01bfc291a5df34db8701a Mon Sep 17 00:00:00 2001 From: spookerton Date: Sat, 22 Oct 2022 05:34:50 +0100 Subject: [PATCH] no vchat failed alert if we don't want vchat --- code/modules/vchat/vchat_client.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index 1c763155c5..86493a491e 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -153,13 +153,12 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic /datum/chatOutput/proc/become_broken() broken = TRUE loaded = FALSE - if(!owner) qdel(src) return - update_vis() - + if (!owner.is_preference_enabled(/datum/client_preference/vchat_enable)) + return spawn() alert(owner,"VChat didn't load after some time. Switching to use oldchat as a fallback. Try using 'Reload VChat' verb in OOC verbs, or reconnecting to try again.") @@ -418,4 +417,4 @@ var/global/to_chat_src if(!fdel(o_file)) spawn(1 MINUTE) if(!fdel(o_file)) - log_debug("Warning: [ckey]'s chatlog could not be deleted one minute after file transfer was initiated. It is located at 'data/chatlog_tmp/[ckey]_chat_log' and will need to be manually removed.") \ No newline at end of file + log_debug("Warning: [ckey]'s chatlog could not be deleted one minute after file transfer was initiated. It is located at 'data/chatlog_tmp/[ckey]_chat_log' and will need to be manually removed.")