From 781f6d9dba4781efaf0d642e1f577b4addbb3942 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Fri, 28 Nov 2025 13:56:42 +1100
Subject: [PATCH] fix(color): radio may crash when using key shortcuts (#6832)

---
 radio/src/gui/colorlcd/setup_menus/quick_menu.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
index 8e021721b..a768ed75f 100644
--- a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
+++ b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
@@ -509,6 +509,7 @@ void QuickMenu::onSelect(bool close)
 {
   closeMenu();
   if (selectHandler) selectHandler(close);
+  selectHandler = nullptr;
 }
 
 void QuickMenu::closeMenu()
@@ -516,6 +517,7 @@ void QuickMenu::closeMenu()
   Layer::pop(this);
   hide();
   if (cancelHandler) cancelHandler();
+  cancelHandler = nullptr;
 }
 
 void QuickMenu::onCancel()