godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45853 from groud/fix_crash_on_exit 

Fixes crash when exiting with --verbose with leaked resources
This commit is contained in:
Rémi Verschelde 2021-02-09 18:38:18 +01:00 committed by GitHub
parent fa4ddbcb33 25c4dacb88
commit 7d9eed093a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/logger.cpp
View File

@ -207,7 +207,7 @@ void RotatedFileLogger::logv(const char *p_format, va_list p_list, bool p_err) {
Memory::free_static(buf); Memory::free_static(buf);
} }
if (p_err || GLOBAL_GET("application/run/flush_stdout_on_print")) { if (p_err || !ProjectSettings::get_singleton() || GLOBAL_GET("application/run/flush_stdout_on_print")) {
// Don't always flush when printing stdout to avoid performance // Don't always flush when printing stdout to avoid performance
// issues when `print()` is spammed in release builds. // issues when `print()` is spammed in release builds.
file->flush(); file->flush();
@ -228,7 +228,7 @@ void StdLogger::logv(const char *p_format, va_list p_list, bool p_err) {
vfprintf(stderr, p_format, p_list); vfprintf(stderr, p_format, p_list);
} else { } else {
vprintf(p_format, p_list); vprintf(p_format, p_list);
if (GLOBAL_GET("application/run/flush_stdout_on_print")) { if (!ProjectSettings::get_singleton() || GLOBAL_GET("application/run/flush_stdout_on_print")) {
// Don't always flush when printing stdout to avoid performance // Don't always flush when printing stdout to avoid performance
// issues when `print()` is spammed in release builds. // issues when `print()` is spammed in release builds.
fflush(stdout); fflush(stdout);