From 4971820f40a565cb2549bfcb3875463fcaa811cc Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Mon, 25 Aug 2014 10:51:27 +0200
Subject: [PATCH] Re #1547: commit 5949be30fa3c2cc1888d8e6f7839d231788e3d40
 disabled delay for STICKY (which was wrong) now disabled for EDGE

---
 companion/src/modeledit/logicalswitches.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index 2286dc1be..224c61add 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -320,7 +320,6 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       }
       break;
     case LS_FAMILY_STICKY:
-      mask &= ~DELAY_ENABLED;
       // no break
     case LS_FAMILY_VBOOL:
       mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
@@ -329,6 +328,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       break;
     case LS_FAMILY_STAY:
       mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE;
+      mask &= ~DELAY_ENABLED;
       populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
       updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
       updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value());