engine: fix flashing fade out (fix #1624)

Fix also: https://www.qlcplus.org/forum/viewtopic.php?t=17774
mcallegari · Oct 8, 2024 · cb92abd · cb92abd
1 parent 640e905
commit cb92abd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,6 @@
 qlcplus (4.13.2) stable; urgency=low
 
+  * engine: fix flashing fade out
   * engine: add stopOnExit, waitFunctionStart and waitFunctionStop commands to Script - see documentation (thanks to ldebs)
   * UI/Show Manager: show step notes on the timeline (thanks to anarchid)
   * Web Access: fix grand master stopping running functions

diff --git a/engine/src/genericfader.cpp b/engine/src/genericfader.cpp
@@ -340,16 +340,16 @@ void GenericFader::setFadeOut(bool enable, uint fadeTime)
     {
         FadeChannel& fc(it.next().value());
 
-        // non-intensity channels (eg LTP) should fade
-        // to the current universe value
-        if ((fc.flags() & FadeChannel::Intensity) == 0)
-            fc.addFlag(FadeChannel::SetTarget);
-
         fc.setStart(fc.current());
+        // all channels should fade to the current universe value
+        fc.addFlag(FadeChannel::SetTarget);
         fc.setTarget(0);
         fc.setElapsed(0);
         fc.setReady(false);
         fc.setFadeTime(fc.canFade() ? fadeTime : 0);
+        // if flashing, remove the flag and treat
+        // it like a regular fade out to target
+        fc.removeFlag(FadeChannel::Flashing);
     }
 }