From f8612a0dbece9b4e97421f7e55c5c461e54f9caf Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 21 May 2022 12:14:27 +0200
Subject: [PATCH] menu: onPress() must be executed after menu is removed

---
 radio/src/thirdparty/libopenui/src/menu.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 8115907a4..a880947b5 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -109,9 +109,10 @@ void MenuBody::onPress(size_t index)
       else
         setIndex(index);
     } else {
-      setIndex(index);
-      lines[index].onPress();
+      // delete menu first to avoid
+      // focus issues with onPress()
       menu->deleteLater();
+      lines[index].onPress();
     }
   }
 }