Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Fix #1610: don't assert an expected null pointer

Browse Source
This commit is contained in:
embeddedt 2020-06-24 12:25:16 -04:00 committed by GitHub
parent 63aba1b3de
commit b77d484a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lv_widgets/lv_list.c
View File

@ -462,7 +462,6 @@ lv_obj_t * lv_list_get_next_btn(const lv_obj_t * list, lv_obj_t * prev_btn)
*/ */
int32_t lv_list_get_btn_index(const lv_obj_t * list, const lv_obj_t * btn) int32_t lv_list_get_btn_index(const lv_obj_t * list, const lv_obj_t * btn)
{ {
LV_ASSERT_OBJ(list, LV_OBJX_NAME);
LV_ASSERT_OBJ(btn, "lv_btn"); LV_ASSERT_OBJ(btn, "lv_btn");
int index = 0; int index = 0;
@ -470,6 +469,8 @@ int32_t lv_list_get_btn_index(const lv_obj_t * list, const lv_obj_t * btn)
/* no list provided, assuming btn is part of a list */ /* no list provided, assuming btn is part of a list */
list = lv_obj_get_parent(lv_obj_get_parent(btn)); list = lv_obj_get_parent(lv_obj_get_parent(btn));
} }
LV_ASSERT_OBJ(list, LV_OBJX_NAME);
lv_obj_t * e = lv_list_get_next_btn(list, NULL); lv_obj_t * e = lv_list_get_next_btn(list, NULL);
while(e != NULL) { while(e != NULL) {
if(e == btn) { if(e == btn) {