[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - slideshow/source
GülÅah Köse (via logerrit)
logerrit at kemper.freedesktop.org
Sun Mar 29 16:06:16 UTC 2020
slideshow/source/engine/effectrewinder.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 49e114d3803178f8720620834f97e2ab0962e826
Author: Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Mon Mar 23 15:33:40 2020 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Mar 29 18:05:59 2020 +0200
tdf#131254 Prevent extra eventqueue empty call.
That call disables advance timing setting when we back
to previous slide. Its comment line says "Process initial
events and skip any animations that are started when the
slide is shown" but it can still skip any animations.
It seems that is an unnneeded call here.
Change-Id: Iec23409da8285f5b7a8bff3d9c4f507a997ae885
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90913
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
(cherry picked from commit 80f386f787ad59936ead2022e6d932a6d441c6e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91118
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index d8889024108b..1a1dc0636363 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -412,7 +412,7 @@ void EffectRewinder::asynchronousRewind (
// Process initial events and skip any animations that are started
// when the slide is shown.
mbNonUserTriggeredMainSequenceEffectSeen = false;
- mrEventQueue.forceEmpty();
+
if (mbNonUserTriggeredMainSequenceEffectSeen)
{
mrUserEventQueue.callSkipEffectEventHandler();
More information about the Libreoffice-commits
mailing list