Fixes #6727

radio/src/main.cpp

@@ -291,7 +291,7 @@ void guiMain(event_t evt)
 
   if (!refreshNeeded) {
     DEBUG_TIMER_START(debugTimerMenus);
-    while (1) {
+    while (true) {
       // normal GUI from menus
       const char * warn = warningText;
       uint8_t menu = popupMenuItemsCount;
@@ -315,7 +315,7 @@ void guiMain(event_t evt)
             if (result) {
               TRACE("popupMenuHandler(%s)", result);
               auto handler = popupMenuHandler;
-              popupMenuHandler = nullptr;
+              CLEAR_POPUP();
               handler(result);
               if (menuEvent == 0) {
                 evt = EVT_REFRESH;
@@ -391,7 +391,6 @@ void handleGui(event_t event) {
       }
     }
     menuHandlers[menuLevel](event);
-    // todo     drawStatusLine(); here???
   }
   else
 #endif
@@ -456,7 +455,7 @@ void guiMain(event_t evt)
     if (result) {
       TRACE("popupMenuHandler(%s)", result);
       auto handler = popupMenuHandler;
-      popupMenuHandler = nullptr;
+      CLEAR_POPUP();
       handler(result);
     }
   }