Merge pull request #217 from EdgeTX/mpm-subtype

Fixed MPM proto subtype reset on subtype change

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

@@ -1576,6 +1576,7 @@ void menuModelSetup(event_t event)
         if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
           const char * title = getMultiOptionTitle(moduleIdx);
 
+          if (!title) break;
           lcdDrawText(INDENT_WIDTH, y, title);
           if (title == STR_MULTI_RFTUNE) {
             lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, "RSSI(", LEFT);

radio/src/pulses/modules_helpers.h

@@ -678,7 +678,6 @@ inline void resetMultiProtocolsOptions(uint8_t moduleIdx)
   else {
     g_model.moduleData[moduleIdx].multi.autoBindMode = 0;
   }
-  g_model.moduleData[moduleIdx].subType = 0;
   g_model.moduleData[moduleIdx].multi.optionValue = 0;
   g_model.moduleData[moduleIdx].multi.disableTelemetry = 0;
   g_model.moduleData[moduleIdx].multi.disableMapping = 0;