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

Stop Companion crash when conversion switch index out of range (#8469)

Browse Source
This commit is contained in:
Neil Horne
2021-04-24 11:47:50 +02:00
committed by GitHub
parent 77f1840af6
commit 890888f3e3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/rawswitch.cpp
+4 -1
View File
@@ -191,7 +191,10 @@ RawSwitch RawSwitch::convert(RadioDataConversionState & cstate)
QStringList fromSwitchList(getSwitchList(cstate.fromBoard));
QStringList toSwitchList(getSwitchList(cstate.toBoard));
// set to -1 if no match found
newIdx = toSwitchList.indexOf(fromSwitchList.at(swtch.quot));
if (swtch.quot < fromSwitchList.count())
newIdx = toSwitchList.indexOf(fromSwitchList.at(swtch.quot));
else
newIdx = -1;
// perform forced mapping
if (newIdx < 0) {
if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_FAMILY_HORUS_OR_T16(cstate.fromType))) {