From 34cb3e8bd1cefccb916763b3ede10d096d6252a3 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Mon, 25 Apr 2022 19:42:32 +0200 Subject: [PATCH] Add Clear Fonts to Clear Pages button in File Editor --- src/hasp/hasp.cpp | 1 + src/hasp/hasp_font.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp index 05598966..5e074f61 100644 --- a/src/hasp/hasp.cpp +++ b/src/hasp/hasp.cpp @@ -612,6 +612,7 @@ IRAM_ATTR void haspLoop(void) void hasp_init(void) { haspPages.init(haspStartPage); // StartPage is used for the BACK action + font_clear_list(); // free TTF resources } void hasp_load_json(void) diff --git a/src/hasp/hasp_font.cpp b/src/hasp/hasp_font.cpp index 226d8472..52d781ff 100644 --- a/src/hasp/hasp_font.cpp +++ b/src/hasp/hasp_font.cpp @@ -76,7 +76,10 @@ void font_clear_list() } /* Free the allocated font_name last */ - hasp_free(font_p->payload); + if(font_p->payload) { + LOG_DEBUG(TAG_FONT, F("Released font %s"), font_p->payload); + hasp_free(font_p->payload); + } _lv_ll_remove(&hasp_fonts_ll, node); lv_mem_free(node);