From dd613ac895247bac8a4f94705f82e6e290649f74 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Mon, 28 Sep 2026 13:57:10 +1000
Subject: [PATCH] fix(color): potential crash when closing popup menu with a
 menu toolbar (#7838)

---
 radio/src/gui/colorlcd/libui/menutoolbar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/radio/src/gui/colorlcd/libui/menutoolbar.cpp b/radio/src/gui/colorlcd/libui/menutoolbar.cpp
index 3dced4091..a15620881 100644
--- a/radio/src/gui/colorlcd/libui/menutoolbar.cpp
+++ b/radio/src/gui/colorlcd/libui/menutoolbar.cpp
@@ -59,6 +59,10 @@ MenuToolbarButton::MenuToolbarButton(Window* parent, const rect_t& rect,
   auto label = etx_label_create(lvobj);
   lv_label_set_text(label, picto);
   lv_obj_center(label);
+
+  onClosing([=]() {
+    lv_group_remove_obj(lvobj);
+  });
 }
 
 MenuToolbar::MenuToolbar(Choice* choice, Menu* menu, const int columns) :