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

Merge branch 'master' of https://github.com/littlevgl/lvgl

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-23 14:20:08 +02:00
parent 8ed806ce5c 67323ef733
commit 46a21485a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/lv_group.c
View File

@@ -145,7 +145,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
LV_LOG_TRACE("begin"); LV_LOG_TRACE("begin");
/*Focus on the next object*/ /*Focus on the next object*/
if(*g->obj_focus == obj) { if(g->obj_focus && *g->obj_focus == obj) {
if(g->frozen) g->frozen = 0; if(g->frozen) g->frozen = 0;
/*If this is the only object in the group then focus to nothing.*/ /*If this is the only object in the group then focus to nothing.*/
@@ -161,7 +161,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
/*If the focuses object is still the same then it was the only object in the group but it will /*If the focuses object is still the same then it was the only object in the group but it will
*be deleted. Set the `obj_focus` to NULL to get back to the initial state of the group with *be deleted. Set the `obj_focus` to NULL to get back to the initial state of the group with
*zero objects*/ *zero objects*/
if(*g->obj_focus == obj) { if(g->obj_focus && *g->obj_focus == obj) {
g->obj_focus = NULL; g->obj_focus = NULL;
} }