From 4c2df29808bdcd4520a51fdb9647aa231d405f2e Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sat, 22 Dec 2018 20:41:20 +0100 Subject: [PATCH] lv_group: do not modify the focused style if the syle_mod function is NULL --- lv_core/lv_group.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lv_core/lv_group.c b/lv_core/lv_group.c index 9c1ed4b54..3fbcc4064 100644 --- a/lv_core/lv_group.c +++ b/lv_core/lv_group.c @@ -373,11 +373,9 @@ lv_style_t * lv_group_mod_style(lv_group_t * group, const lv_style_t * style) lv_style_copy(&group->style_tmp, style); if(group->editing) { - if(group->style_mod_edit != NULL) group->style_mod_edit(&group->style_tmp); - else style_mod_edit_def(&group->style_tmp); + if(group->style_mod_edit) group->style_mod_edit(&group->style_tmp); } else { - if(group->style_mod != NULL) group->style_mod(&group->style_tmp); - else style_mod_def(&group->style_tmp); + if(group->style_mod) group->style_mod(&group->style_tmp); } return &group->style_tmp; }