From 017c13dbdc846967356820980af4a46ca419881b Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 4 Jul 2015 17:50:50 +0200 Subject: [PATCH] Fixes #2415 --- radio/src/gui/Taranis/menu_model_inputs_mixes.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp index 9fe344072..c345785d1 100644 --- a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp +++ b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp @@ -169,8 +169,12 @@ void insertExpoMix(uint8_t expo, uint8_t idx) memclear(mix, sizeof(MixData)); mix->destCh = s_currCh-1; mix->srcRaw = s_currCh; - if (!isSourceAvailable(mix->srcRaw)) + if (!isSourceAvailable(mix->srcRaw)) { mix->srcRaw = (s_currCh > 4 ? MIXSRC_Rud - 1 + s_currCh : MIXSRC_Rud - 1 + channel_order(s_currCh)); + while (!isSourceAvailable(mix->srcRaw)) { + mix->srcRaw += 1; + } + } mix->weight = 100; } resumeMixerCalculations();