From c55d915d56708997f2cb778cf861dcefe6b9e980 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 15 Jun 2021 06:15:53 +0200 Subject: [PATCH] Fixed MPM proto subtype reset on subtype change --- radio/src/gui/128x64/model_setup.cpp | 1 + radio/src/pulses/modules_helpers.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 12ddf963d..08f1072c1 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/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); diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 227aa974d..c33a433c4 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/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;