Skip to content

Commit

Permalink
Update lv_display.c: changed lv_screen_active() to d->act_scr
Browse files Browse the repository at this point in the history
changed lv_screen_active() calls to d->act_scr
  • Loading branch information
TheOfficialMrBlah committed May 12, 2024
1 parent 4e050b8 commit 613d837
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/display/lv_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ void lv_screen_load_anim(lv_obj_t * new_scr, lv_screen_load_anim_t anim_type, ui
bool auto_del)
{
lv_display_t * d = lv_obj_get_display(new_scr);
lv_obj_t * act_scr = lv_screen_active();
lv_obj_t * act_scr = d->act_scr;

if(act_scr == new_scr || d->scr_to_load == new_scr) {
return;
Expand All @@ -586,7 +586,7 @@ void lv_screen_load_anim(lv_obj_t * new_scr, lv_screen_load_anim_t anim_type, ui
if(d->del_prev) {
lv_obj_delete(act_scr);
}
act_scr = lv_screen_active(); /*Active screen changed.*/
act_scr = d->act_scr; /*Active screen changed.*/

scr_load_internal(d->scr_to_load);
}
Expand Down Expand Up @@ -1031,7 +1031,7 @@ static void scr_load_anim_start(lv_anim_t * a)
{
lv_display_t * d = lv_obj_get_display(a->var);

d->prev_scr = lv_display_get_screen_active(d);
d->prev_scr = d->act_scr;
d->act_scr = a->var;

lv_obj_send_event(d->act_scr, LV_EVENT_SCREEN_LOAD_START, NULL);
Expand Down

0 comments on commit 613d837

Please sign in to comment.