fix(color): radio may crash when using key shortcuts (#6832)

philmoz · web-flow · commit 781f6d9dba47 · 2025-11-28T12:56:42.000+10:00
diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
@@ -509,13 +509,15 @@ void QuickMenu::onSelect(bool close)
 {
   closeMenu();
   if (selectHandler) selectHandler(close);
+  selectHandler = nullptr;
 }
 
 void QuickMenu::closeMenu()
 {
   Layer::pop(this);
   hide();
   if (cancelHandler) cancelHandler();
+  cancelHandler = nullptr;
 }
 
 void QuickMenu::onCancel()

Original file line number	Diff line number	Diff line change
`@@ -509,13 +509,15 @@ void QuickMenu::onSelect(bool close)`
`509`	`509`	`{`
`510`	`510`	`closeMenu();`
`511`	`511`	`if (selectHandler) selectHandler(close);`
	`512`	`+ selectHandler = nullptr;`
`512`	`513`	`}`
`513`	`514`
`514`	`515`	`void QuickMenu::closeMenu()`
`515`	`516`	`{`
`516`	`517`	`Layer::pop(this);`
`517`	`518`	`hide();`
`518`	`519`	`if (cancelHandler) cancelHandler();`
	`520`	`+ cancelHandler = nullptr;`
`519`	`521`	`}`
`520`	`522`
`521`	`523`	`void QuickMenu::onCancel()`