summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2020-03-23 15:33:40 +0300
committerAndras Timar <andras.timar@collabora.com>2020-03-29 18:05:59 +0200
commit49e114d3803178f8720620834f97e2ab0962e826 (patch)
treec028500b992c3d9b68521e2e7df280bb6e7b8bf8
parentBreeze & Colibre: Fix for tdf#131636 to Bg & to Fg icons (diff)
downloadcore-49e114d3803178f8720620834f97e2ab0962e826.tar.gz
core-49e114d3803178f8720620834f97e2ab0962e826.zip
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@collabora.com> (cherry picked from commit 80f386f787ad59936ead2022e6d932a6d441c6e9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91118 Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--slideshow/source/engine/effectrewinder.cxx2
1 files changed, 1 insertions, 1 deletions
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();