From 2708fdf378b4c637e7207d80c970e1d204467750 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 22 Nov 2019 18:42:33 +0100
Subject: [PATCH] Better fix

---
 radio/src/gui/480x272/radio_version.cpp |  8 --------
 radio/src/gui/480x272/view_main.cpp     | 17 ++++-------------
 radio/src/telemetry/frsky_pxx2.cpp      |  5 +++++
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/radio/src/gui/480x272/radio_version.cpp b/radio/src/gui/480x272/radio_version.cpp
index a8cff4947..33ab73607 100644
--- a/radio/src/gui/480x272/radio_version.cpp
+++ b/radio/src/gui/480x272/radio_version.cpp
@@ -124,14 +124,6 @@ bool menuRadioModulesVersion(event_t event)
         if (variant < DIM(variants)) {
           lcdDrawText(lcdNextPos + 1, y, variants[variant]);
         }
-        if (!globalData.upgradeModulePopup &&
-            reusableBuffer.hardwareAndSettings.modules[module].information.modelID == PXX2_MODULE_ISRM_S_X10S &&
-            reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.major == 0 &&
-            reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.minor == 1 &&
-            reusableBuffer.hardwareAndSettings.modules[module].information.swVersion.revision < 5) {
-          globalData.upgradeModulePopup = 1;
-          POPUP_WARNING(STR_MODULE_UPGRADE);
-        }
       }
     }
     y += FH;
diff --git a/radio/src/gui/480x272/view_main.cpp b/radio/src/gui/480x272/view_main.cpp
index 3cf249dab..cbc38b69b 100644
--- a/radio/src/gui/480x272/view_main.cpp
+++ b/radio/src/gui/480x272/view_main.cpp
@@ -224,19 +224,10 @@ bool menuMainView(event_t event)
   }
 
 #if defined(HARDWARE_INTERNAL_MODULE) && defined(INTERNAL_MODULE_PXX2) && defined(ACCESS_LIB)
-  if (globalData.authenticationCount > 0 && !globalData.upgradeModulePopup) {
-    if (!globalData.internalModuleVersionChecked) {
-      globalData.internalModuleVersionChecked = 1;
-      memclear(&reusableBuffer.viewMain.internalModule, sizeof(reusableBuffer.viewMain.internalModule));
-      moduleState[INTERNAL_MODULE].readModuleInformation(&reusableBuffer.viewMain.internalModule, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
-    }
-    else if (reusableBuffer.viewMain.internalModule.information.modelID == PXX2_MODULE_ISRM_S_X10S &&
-             reusableBuffer.viewMain.internalModule.information.swVersion.major == 0 &&
-             reusableBuffer.viewMain.internalModule.information.swVersion.minor == 1 &&
-             reusableBuffer.viewMain.internalModule.information.swVersion.revision < 5) {
-      globalData.upgradeModulePopup = 1;
-      POPUP_WARNING(STR_MODULE_UPGRADE);
-    }
+  if (globalData.authenticationCount > 0 && !globalData.upgradeModulePopup && !globalData.internalModuleVersionChecked) {
+    globalData.internalModuleVersionChecked = 1;
+    memclear(&reusableBuffer.viewMain.internalModule, sizeof(reusableBuffer.viewMain.internalModule));
+    moduleState[INTERNAL_MODULE].readModuleInformation(&reusableBuffer.viewMain.internalModule, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
   }
 #endif
 
diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp
index 1d987474b..78cd3313b 100644
--- a/radio/src/telemetry/frsky_pxx2.cpp
+++ b/radio/src/telemetry/frsky_pxx2.cpp
@@ -35,6 +35,11 @@ void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame)
     memcpy(&destination->information, &frame[4], length);
     if (destination->information.capabilities & ~((1 << MODULE_CAPABILITY_COUNT) - 1))
       destination->information.capabilityNotSupported = true;
+    if (!globalData.upgradeModulePopup && destination->information.modelID == PXX2_MODULE_ISRM_S_X10S &&
+        destination->information.swVersion.major == 0 && destination->information.swVersion.minor == 1 && destination->information.swVersion.revision < 5) {
+      globalData.upgradeModulePopup = 1;
+      POPUP_WARNING(STR_MODULE_UPGRADE);
+    }
   }
   else if (index < PXX2_MAX_RECEIVERS_PER_MODULE && modelId < DIM(PXX2ReceiversNames)) {
     memcpy(&destination->receivers[index].information, &frame[4], length);