github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(disp): fix infinite recursive SCREEN_LOADED events

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-12-06 09:15:43 +01:00
parent 62809453ac
commit 9c9c865dc4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/display/lv_display.c
View File

@@ -567,9 +567,7 @@ void lv_screen_load_anim(lv_obj_t * new_scr, lv_screen_load_anim_t anim_type, ui
/*Shortcut for immediate load*/ /*Shortcut for immediate load*/
if(time == 0 && delay == 0) { if(time == 0 && delay == 0) {
scr_load_internal(new_scr); scr_load_internal(new_scr);
d->scr_to_load = NULL;
if(auto_del) lv_obj_delete(act_scr); if(auto_del) lv_obj_delete(act_scr);
return; return;
} }
@@ -905,6 +903,7 @@ static void scr_load_internal(lv_obj_t * scr)
if(d->act_scr) lv_obj_send_event(scr, LV_EVENT_SCREEN_LOAD_START, NULL); if(d->act_scr) lv_obj_send_event(scr, LV_EVENT_SCREEN_LOAD_START, NULL);
d->act_scr = scr; d->act_scr = scr;
d->scr_to_load = NULL;
if(d->act_scr) lv_obj_send_event(scr, LV_EVENT_SCREEN_LOADED, NULL); if(d->act_scr) lv_obj_send_event(scr, LV_EVENT_SCREEN_LOADED, NULL);
if(d->act_scr) lv_obj_send_event(old_scr, LV_EVENT_SCREEN_UNLOADED, NULL); if(d->act_scr) lv_obj_send_event(old_scr, LV_EVENT_SCREEN_UNLOADED, NULL);