From f545db3117303dbdedac4b0499587011a418c956 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 29 Mar 2020 22:00:48 +0200 Subject: [PATCH] minor fixes --- src/lv_core/lv_refr.c | 14 +++++++------- src/lv_misc/lv_gc.h | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index 051a04a57..7b55e79a2 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -179,6 +179,13 @@ void lv_disp_refr_task(lv_task_t * task) disp_refr = task->user_data; +#if LV_USE_PERF_MONITOR == 0 + /* Ensure the task does not run again automatically. + * This is done before refreshing in case refreshing invalidates something else. + */ + lv_task_set_prio(task, LV_TASK_PRIO_OFF); +#endif + /*Do nothing if there is no active screen*/ if(disp_refr->act_scr == NULL) { disp_refr->inv_p = 0; @@ -273,13 +280,6 @@ void lv_disp_refr_task(lv_task_t * task) } #endif -#if LV_USE_PERF_MONITOR == 0 - /* Ensure the task does not run again automatically. - * This is done before refreshing in case refreshing invalidates something else. - */ - lv_task_set_prio(task, LV_TASK_PRIO_OFF); -#endif - LV_LOG_TRACE("lv_refr_task: ready"); } diff --git a/src/lv_misc/lv_gc.h b/src/lv_misc/lv_gc.h index 73b6ce6b4..f25fd8e61 100644 --- a/src/lv_misc/lv_gc.h +++ b/src/lv_misc/lv_gc.h @@ -17,6 +17,7 @@ extern "C" { #include #include "lv_mem.h" #include "lv_ll.h" +#include "lv_task.h" #include "../lv_draw/lv_img_cache.h" #include "../lv_draw/lv_draw.h" @@ -35,7 +36,7 @@ extern "C" { f(lv_ll_t, _lv_img_defoder_ll) \ f(lv_ll_t, _lv_obj_style_trans_ll) \ f(lv_img_cache_entry_t*, _lv_img_cache_array) \ - f(void*, _lv_task_act) \ + f(lv_task_t*, _lv_task_act) \ f(lv_mem_buf_arr_t , _lv_mem_buf) \ #define LV_DEFINE_ROOT(root_type, root_name) root_type root_name;