From 45daee85f4507d97842da5c534701d5e0f808b36 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 4 Jun 2022 14:12:50 +0200 Subject: [PATCH 1/2] Fix bug with id 7 when a tabview is present on the page --- src/hasp/hasp_object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hasp/hasp_object.cpp b/src/hasp/hasp_object.cpp index f62b1383..724bfb2b 100644 --- a/src/hasp/hasp_object.cpp +++ b/src/hasp/hasp_object.cpp @@ -39,7 +39,7 @@ lv_obj_t* hasp_find_obj_from_parent_id(lv_obj_t* parent, uint8_t objid) for(uint16_t i = 0; i < tabcount; i++) { lv_obj_t* tab = lv_tabview_get_tab(child, i); // LOG_DEBUG(TAG_HASP, "Found tab %i", i); - if(tab->user_data.objid && objid == tab->user_data.objid) return tab; /* tab found, return it */ + if(tab->user_data.id && objid == tab->user_data.id) return tab; /* tab found, return it */ /* check grandchildren */ grandchild = hasp_find_obj_from_parent_id(tab, objid); From 7357842b87ac75b7e78062b8d0ec365f1b1e2bbf Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 4 Jun 2022 14:14:18 +0200 Subject: [PATCH 2/2] Fix workflow trigger --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0a435373..c3e90ffa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -5,7 +5,7 @@ on: types: [created] push: branches: - - main + - master paths-ignore: - '**.md' - '**.yml'