Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-31 07:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(disp): fix the use of a null pointer in lv_scr_load_anim (#3951)

Browse Source
This commit is contained in:
Mirco Pizzichini
2023-02-01 10:19:27 +01:00
committed by GitHub
parent 837f503592
commit 1bfd3cad8f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lv_disp.c
+5 -3
View File
@@ -261,13 +261,15 @@ void lv_scr_load_anim(lv_obj_t * new_scr, lv_scr_load_anim_t anim_type, uint32_t
/*Be sure there is no other animation on the screens*/ /*Be sure there is no other animation on the screens*/
lv_anim_del(new_scr, NULL); lv_anim_del(new_scr, NULL);
lv_anim_del(lv_scr_act(), NULL); lv_anim_del(act_scr, NULL);
/*Be sure both screens are in a normal position*/ /*Be sure both screens are in a normal position*/
lv_obj_set_pos(new_scr, 0, 0); lv_obj_set_pos(new_scr, 0, 0);
lv_obj_set_pos(lv_scr_act(), 0, 0);
lv_obj_remove_local_style_prop(new_scr, LV_STYLE_OPA, 0); lv_obj_remove_local_style_prop(new_scr, LV_STYLE_OPA, 0);
lv_obj_remove_local_style_prop(lv_scr_act(), LV_STYLE_OPA, 0); if(act_scr) {
lv_obj_set_pos(act_scr, 0, 0);
lv_obj_remove_local_style_prop(act_scr, LV_STYLE_OPA, 0);
}
/*Shortcut for immediate load*/ /*Shortcut for immediate load*/