From bf5c2ca8876669df4311cd9ee80f3130450c89cd Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 16 Feb 2018 16:59:30 +1300 Subject: [PATCH] Merge pull request #35693 from tgstation/Cyberboss-patch-2 Fix world/Error() trying to read config before it loads --- code/modules/error_handler/error_handler.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index 02bf2035b3..91b004e0e0 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) var/configured_error_cooldown var/configured_error_limit var/configured_error_silence_time - if(config) + if(config && config.entries) configured_error_cooldown = CONFIG_GET(number/error_cooldown) configured_error_limit = CONFIG_GET(number/error_limit) configured_error_silence_time = CONFIG_GET(number/error_silence_time)