From 6e01552aa4224cb417c34224874962c351573880 Mon Sep 17 00:00:00 2001
From: Jakub <jklimasz@gmail.com>
Date: Sat, 4 Jan 2020 21:32:50 +0100
Subject: [PATCH 1/2] USB mode menu fixed for libui. (#7267)

---
 radio/src/main.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index df73c9cb7..bf7d7ed89 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -31,7 +31,12 @@ uint8_t mainRequestFlags = 0;
 #if defined(LIBOPENUI)
 void openUsbMenu()
 {
-  auto menu = new Menu(&mainWindow);
+  static Menu* menu = nullptr;
+  if(menu) return;
+  menu = new Menu(&mainWindow);
+  menu->setCloseHandler([=]() {
+    menu = nullptr;
+  });
   menu->setTitle("USB");
   menu->addLine(STR_USB_JOYSTICK, [] {
     setSelectedUsbMode(USB_JOYSTICK_MODE);

From 91ed2e51d261ff81376df804ef5c822a9d3ccc23 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 4 Jan 2020 21:36:05 +0100
Subject: [PATCH 2/2] Cosmetics

---
 radio/src/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index bf7d7ed89..b72db1fe5 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -31,10 +31,11 @@ uint8_t mainRequestFlags = 0;
 #if defined(LIBOPENUI)
 void openUsbMenu()
 {
-  static Menu* menu = nullptr;
-  if(menu) return;
+  static Menu * menu = nullptr;
+  if (menu)
+    return;
   menu = new Menu(&mainWindow);
-  menu->setCloseHandler([=]() {
+  menu->setCloseHandler([]() {
     menu = nullptr;
   });
   menu->setTitle("USB");