From a9dfcdfd6837dba6736e29902ffc9379ed9258b8 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Fri, 9 Jan 2015 20:21:53 +0100 Subject: [PATCH] Fixes #1981: Edge function INSTANT bug for V1>2s (ported from master) --- companion/src/modeledit/logicalswitches.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp index 451c3cfba..59cd184c2 100644 --- a/companion/src/modeledit/logicalswitches.cpp +++ b/companion/src/modeledit/logicalswitches.cpp @@ -248,7 +248,7 @@ void LogicalSwitchesPanel::edited() else { model->logicalSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model->logicalSw[i].val2; } - updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, cswitchOffset[i]->value()-0.1); + updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); if (model->logicalSw[i].val3 == 0) { cswitchOffset2[i]->setSuffix("(infinite)"); } @@ -334,7 +334,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i) mask &= ~DELAY_ENABLED; populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); - updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, cswitchOffset[i]->value()-0.1); + updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); cswitchOffset2[i]->setSpecialValueText(tr("(no release)")); if (model->logicalSw[i].val3 == 0) { cswitchOffset2[i]->setSuffix(tr("(infinite)"));