From 5680c8e58041d28d4eadb50ce9d9450b4ae959db Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 2 Nov 2014 12:58:43 +0100 Subject: [PATCH] Fixes #1737: virtual inputs not selectable in SF Volume and heli Collective Source --- companion/src/modeledit/customfunctions.cpp | 2 +- companion/src/modeledit/heli.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index b8c5d4253..d571fb39b 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -680,7 +680,7 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi b->setCurrentIndex(value); } else if (function==FuncVolume) { - populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS); + populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS); } else if (function==FuncPlayValue) { populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT); diff --git a/companion/src/modeledit/heli.cpp b/companion/src/modeledit/heli.cpp index d5034ecff..07d2ac418 100644 --- a/companion/src/modeledit/heli.cpp +++ b/companion/src/modeledit/heli.cpp @@ -28,7 +28,7 @@ void HeliPanel::update() lock = true; ui->swashTypeCB->setCurrentIndex(model->swashRingData.type); - populateSourceCB(ui->swashCollectiveCB, model->swashRingData.collectiveSource, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS); + populateSourceCB(ui->swashCollectiveCB, model->swashRingData.collectiveSource, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS); ui->swashRingValSB->setValue(model->swashRingData.value); ui->swashInvertELE->setChecked(model->swashRingData.invertELE); ui->swashInvertAIL->setChecked(model->swashRingData.invertAIL);