mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Fix startup double runtimes again (#56047)
Prevents runtimes that occur before /world/New is called from runtiming in /world/Error due to lack of the config being loaded.
This commit is contained in:
@@ -21,6 +21,9 @@
|
||||
var/motd
|
||||
var/policy
|
||||
|
||||
/// If the configuration is loaded
|
||||
var/loaded = FALSE
|
||||
|
||||
var/static/regex/ic_filter_regex
|
||||
|
||||
/datum/controller/configuration/proc/admin_reload()
|
||||
@@ -53,6 +56,8 @@
|
||||
LoadPolicy()
|
||||
LoadChatFilter()
|
||||
|
||||
loaded = TRUE
|
||||
|
||||
if (Master)
|
||||
Master.OnConfigLoad()
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
|
||||
var/const/viewtext = "\[view]" // Nesting these in other brackets went poorly
|
||||
//log_debug("Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b> [error_entry.make_link(viewtext)]")
|
||||
var/err_msg_delay
|
||||
if(config)
|
||||
if(config?.loaded)
|
||||
err_msg_delay = CONFIG_GET(number/error_msg_delay)
|
||||
else
|
||||
var/datum/config_entry/CE = /datum/config_entry/number/error_msg_delay
|
||||
|
||||
Reference in New Issue
Block a user