Many fixes

radio/src/gui/128x64/model_setup.cpp

@@ -2067,7 +2067,7 @@ void onRxOptionsUpdateConfirm(const char * result)
   }
 }
 
-enum MenuModelReceiverOptionsItems {
+enum {
   ITEM_RECEIVER_TELEMETRY,
   ITEM_RECEIVER_PWM_RATE,
   ITEM_RECEIVER_PINMAP_FIRST
@@ -2092,7 +2092,7 @@ void menuModelReceiverOptions(event_t event)
     }
   }
 
-  if (reusableBuffer.moduleSettings.dirty == 2 && reusableBuffer.receiverSettings.state == PXX2_SETTINGS_OK) {
+  if (reusableBuffer.receiverSettings.dirty == 2 && reusableBuffer.receiverSettings.state == PXX2_SETTINGS_OK) {
     popMenu();
   }
 

radio/src/gui/128x64/radio_version.cpp

@@ -132,7 +132,10 @@ void menuRadioModulesVersion(event_t event)
     // Module model
     if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
       lcdDrawText(INDENT_WIDTH, y, "Model");
-      lcdDrawText(12 * FW, y, modulesModels[reusableBuffer.hardware.modules[module].modelID]);
+      uint8_t modelId = reusableBuffer.hardware.modules[module].modelID;
+      if (modelId >= DIM(modulesModels))
+        modelId = 0;
+      lcdDrawText(12 * FW, y, modulesModels[modelId]);
     }
     y += FH;
 
@@ -151,7 +154,10 @@ void menuRadioModulesVersion(event_t event)
         if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
           lcdDrawText(INDENT_WIDTH, y, "Receiver");
           lcdDrawNumber(lcdLastRightPos + 2, y, receiver + 1);
-          lcdDrawText(12 * FW, y, receiversModels[reusableBuffer.hardware.modules[module].receivers[receiver].modelID]);
+          uint8_t modelId = reusableBuffer.hardware.modules[module].receivers[receiver].modelID;
+          if (modelId >= DIM(receiversModels))
+            modelId = 0;
+          lcdDrawText(12 * FW, y, receiversModels[modelId]);
         }
         y += FH;
 

radio/src/gui/common/stdlcd/popups.cpp

@@ -156,9 +156,10 @@ void runPopupWarning(event_t event)
       if (warningType == WARNING_TYPE_CONFIRM) {
         warningType = WARNING_TYPE_ASTERISK;
         warningText = nullptr;
-        warningResult = true;
         if (popupMenuHandler)
           popupMenuHandler(STR_OK);
+        else
+          warningResult = true;
         break;
       }
       // no break