diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index ed4e648e6d0..b70c2741e83 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -295,7 +295,8 @@ prefs.last_id = computer_id //these are gonna be used for banning . = ..() //calls mob.Login() - chatOutput.start() + spawn() // Goonchat does some non-instant checks in start() + chatOutput.start() if(custom_event_msg && custom_event_msg != "") to_chat(src, "

Custom Event

") diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index e8af8c93430..bc5392e2251 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -37,6 +37,9 @@ var/list/chatResources = list( broken = TRUE return 0 + if(!owner) // In case the client vanishes before winexists returns + return 0 + if(winget(owner, "browseroutput", "is-disabled") == "false") doneLoading()