Port #4116 to Next (#4118)

Fixes #4103: SF repeat parameter was not reset when changing function type
This commit is contained in:
3djc
2016-12-10 19:33:13 +01:00
committed by Damjan Adamic
parent 6325c3d40f
commit c3238ee38c
+6 -3
View File
@@ -67,7 +67,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
mediaPlayerCurrent(-1),
mediaPlayer(NULL)
{
Stopwatch s1("CustomFunctionsPanel - populate");
Stopwatch s1("CustomFunctionsPanel - populate");
lock = true;
int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
@@ -337,8 +337,11 @@ void CustomFunctionsPanel::functionEdited()
if (!lock) {
lock = true;
int index = sender()->property("index").toInt();
fswtchParamArmT[index]->setCurrentIndex(0);
refreshCustomFunction(index, true);
RawSwitch swtch = functions[index].swtch;
functions[index].clear();
functions[index].swtch = swtch;
functions[index].func = (AssignFunc)fswtchFunc[index]->itemData(fswtchFunc[index]->currentIndex()).toInt();
refreshCustomFunction(index);
emit modified();
lock = false;
}