diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index c46aae3e3..783fc656e 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -687,7 +687,7 @@ class ModuleWindow : public FormGroup { const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol(); if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) { // Multi optional feature row - const char *title = getMultiOptionTitle(moduleIdx); + const char *title = getMultiOptionTitleStatic(moduleIdx); if (title != nullptr) { grid.nextLine(); new StaticText(this, grid.getLabelSlot(true), title); diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index f703aa5e3..058c20765 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -1100,6 +1100,13 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol) #endif #if defined(MULTIMODULE) +const char * getMultiOptionTitleStatic(uint8_t moduleIdx) +{ + const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol(); + const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto); + return pdef->optionsstr; +} + const char * getMultiOptionTitle(uint8_t moduleIdx) { MultiModuleStatus &status = getMultiModuleStatus(moduleIdx); @@ -1110,10 +1117,7 @@ const char * getMultiOptionTitle(uint8_t moduleIdx) } return mm_options_strings::options[status.optionDisp]; } - else { - const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol(); - const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto); - return pdef->optionsstr; - } + + return getMultiOptionTitleStatic(moduleIdx); } #endif diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index 46efa21d0..dff36d222 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -355,6 +355,7 @@ inline uint8_t MODULE_OPTION_ROW(uint8_t moduleIdx) { void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags, uint8_t old_editMode); +const char * getMultiOptionTitleStatic(uint8_t moduleIdx); const char *getMultiOptionTitle(uint8_t moduleIdx); const char * writeScreenshot();