piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): simulator may crash or freeze when RF module is set to MPM (#6954)

Browse Source
This commit is contained in:
philmoz
2026-01-06 09:43:30 +10:00
committed by GitHub
parent a9f86dc001
commit fd39dc128c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common.cpp
+2 -2
View File
@@ -1261,7 +1261,7 @@ const char * getMultiOptionTitleStatic(uint8_t moduleIdx)
{
const uint8_t multi_proto = g_model.moduleData[moduleIdx].multi.rfProtocol;
const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
return STR_VAL(pdef->optionsstr);
return STR_SAFE_VAL(pdef->optionsstr);
}
const char * getMultiOptionTitle(uint8_t moduleIdx)
@@ -1272,7 +1272,7 @@ const char * getMultiOptionTitle(uint8_t moduleIdx)
if (status.optionDisp >= getMaxMultiOptions()) {
status.optionDisp = 1; // Unknown options are defaulted to type 1 (basic option)
}
return STR_VAL(mm_options_strings::options[status.optionDisp]);
return STR_SAFE_VAL(mm_options_strings::options[status.optionDisp]);
}
return getMultiOptionTitleStatic(moduleIdx);