Merge pull request #15668 from bfredl/logmenu

fix(tests): don't attempt to call ui functions in free_all_mem()
This commit is contained in:
Björn Linse 2021-09-16 23:36:53 +02:00 committed by GitHub
commit 0c66289cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,9 +69,16 @@ static int pending_has_mouse = -1;
#else
static size_t uilog_seen = 0;
static char uilog_last_event[1024] = { 0 };
#ifndef EXITFREE
#define entered_free_all_mem false
#endif
# define UI_LOG(funname) \
do { \
if (strequal(uilog_last_event, STR(funname))) { \
if (entered_free_all_mem) { \
/* do nothing, we cannot log now */ \
} else if (strequal(uilog_last_event, STR(funname))) { \
uilog_seen++; \
} else { \
if (uilog_seen > 0) { \
@ -107,6 +114,10 @@ static char uilog_last_event[1024] = { 0 };
# include "ui_events_call.generated.h"
#endif
#ifndef EXITFREE
#undef entered_free_all_mem
#endif
void ui_init(void)
{
default_grid.handle = 1;