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

fix conflicts

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-05-07 16:01:48 +02:00
parent 9975036bb2 6a96e07f18
commit 232d22c148
7 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lv_core/lv_indev.c
View File

@@ -735,6 +735,12 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
*/
static void indev_button_proc(lv_indev_t * i, lv_indev_data_t * data)
{
/* Die gracefully if i->btn_points is NULL */
if (i->btn_points == NULL) {
LV_LOG_WARN("indev_button_proc: btn_points was NULL");
return;
}
i->proc.types.pointer.act_point.x = i->btn_points[data->btn_id].x;
i->proc.types.pointer.act_point.y = i->btn_points[data->btn_id].y;