diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2022-06-30 15:42:03 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-06-30 16:00:30 +0200 |
commit | c83084fccb4cdc42d2ca324c974ace0cf974630d (patch) | |
tree | 28e6c87fadd5d1f93b3eea34868bc696a7b7f93e | |
parent | daa055d479916b9fdb9b6cf3bc6aa822f35a2be6 (diff) |
Errors: Fallback to `fprintf` if `OS` singleton doesn't exist
Otherwise we would crash if something prints an error before init or
after destruction of the `OS` singleton which handles printing/logging.
-rw-r--r-- | core/error/error_macros.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/error/error_macros.cpp b/core/error/error_macros.cpp index 8add4b9a3a..f71a642b23 100644 --- a/core/error/error_macros.cpp +++ b/core/error/error_macros.cpp @@ -83,7 +83,13 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co // Main error printing function. void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, bool p_editor_notify, ErrorHandlerType p_type) { - OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, p_message, p_editor_notify, (Logger::ErrorType)p_type); + if (OS::get_singleton()) { + OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, p_message, p_editor_notify, (Logger::ErrorType)p_type); + } else { + // Fallback if errors happen before OS init or after it's destroyed. + const char *err_details = (p_message && *p_message) ? p_message : p_error; + fprintf(stderr, "ERROR: %s\n at: %s (%s:%i)\n", err_details, p_function, p_file, p_line); + } _global_lock(); ErrorHandlerList *l = error_handler_list; |