mirrors/lvgl
0
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2024-12-12 02:53:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(group) rare crash caused by null pointer (#2210)

Browse Source 
Co-authored-by: Alfie Zhao <alfie.zhao@fluidmt.com>
This commit is contained in:
Alfie 2021-04-23 21:28:49 +09:30 committed by GitHub
parent a9bedcf335
commit 67323ef733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats 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");
/*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 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
*be deleted. Set the `obj_focus` to NULL to get back to the initial state of the group with
*zero objects*/
if(*g->obj_focus == obj) {
if(g->obj_focus && *g->obj_focus == obj) {
g->obj_focus = NULL;
}