From f630c5bc59bbc21a2b68dc59fba28a482b4d3d97 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 26 Nov 2019 16:40:09 +0100
Subject: [PATCH] Fix #7014 (OTA RX Update)

---
 radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 14 ++++++++------
 radio/src/pulses/pulses.h                       |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
index 88bfea658..d83110fbc 100644
--- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
@@ -567,13 +567,15 @@ void menuRadioSdManager(event_t _event)
     if (moduleState[EXTERNAL_MODULE].mode == MODULE_MODE_BIND) {
       if (reusableBuffer.sdManager.otaUpdateInformation.step == BIND_INIT) {
         if (reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversCount > 0) {
-          popupMenuItemsCount = min<uint8_t>(reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversCount, PXX2_MAX_RECEIVERS_PER_MODULE);
-          for (uint8_t i=0; i<popupMenuItemsCount; i++) {
-            popupMenuItems[i] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[i];
+          if(reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversCount != popupMenuItemsCount) {
+            CLEAR_POPUP();
+            popupMenuItemsCount = min<uint8_t>(reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversCount,PXX2_MAX_RECEIVERS_PER_MODULE);
+            for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
+              popupMenuItems[rx] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[rx];
+            }
+            popupMenuTitle = STR_PXX2_SELECT_RX;
+            POPUP_MENU_START(onUpdateReceiverSelection);
           }
-          popupMenuTitle = STR_PXX2_SELECT_RX;
-          CLEAR_POPUP();
-          POPUP_MENU_START(onUpdateReceiverSelection);
         }
         else {
           POPUP_WAIT(STR_WAITING_FOR_RX);
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index b7b5e5f27..61b886f22 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -142,7 +142,7 @@ class BindInformation {
 
 class OtaUpdateInformation: public BindInformation {
   public:
-    char filename[32+1];
+    char filename[255+1];
     uint32_t address;
 };