From b6db434c21c22ffa53eaf9e1a8a743710a5a0a3a Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Wed, 27 Jan 2021 10:00:08 +0100
Subject: [PATCH] fix(btnmatrix): fix lv_btnmatrix_get_active_btn_text() when
 used in a group

---
 CHANGELOG.md                  | 4 +++-
 src/lv_widgets/lv_btnmatrix.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee6041b4a..dd84682d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,11 @@
 ## v7.9.2 (Planned for 02.02.2021)
 
 ### New features
-
 - feat(indev) allow input events to be passed to disabled objects 
 
+### Bugfixes
+- fix(btnmatrix) fix lv_btnmatrix_get_active_btn_text() when used in a group
+
 ## v7.9.1
 
 ### Bugfixes
diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c
index aa0324202..cc6868d55 100644
--- a/src/lv_widgets/lv_btnmatrix.c
+++ b/src/lv_widgets/lv_btnmatrix.c
@@ -293,9 +293,11 @@ void lv_btnmatrix_set_focused_btn(lv_obj_t * btnm, uint16_t id)
 
     if(id >= ext->btn_cnt && id != LV_BTNMATRIX_BTN_NONE) return;
 
-    if(id == ext->btn_id_focused) return;
+    if(ext->btn_id_act == LV_BTNMATRIX_BTN_NONE) ext->btn_id_act = id;
 
+    if(id == ext->btn_id_focused) return;
     ext->btn_id_focused = id;
+
     lv_obj_invalidate(btnm);
 }