[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/source

[Ashod Nakashian]

 vcl/source/app/scheduler.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 88cf10987f903078930b6e5f301141f9e1cfce2d
Author: Ashod Nakashian <ashodnakashian at yahoo.com>
Date:   Sun Jul 19 13:33:11 2015 -0400

    tdf#92036 - Writer infinite spelling loop
    
    The periodic timers fire when the current time exceeds the
    start time + the period. However, without reseting the start
    time, the timer would end up thinking it must fire immediatly.
    
    By reseting the start time when firing, the timer will
    only fire again when another period has expired, not immediatly.
    
    Change-Id: Ibd0311b12a514bfd558c0bd6ef83df8c89fd8c7e
    Reviewed-on: https://gerrit.libreoffice.org/17194
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index c3cea78..4cbeeb9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -33,6 +33,9 @@ void ImplSchedulerData::Invoke()
     // prepare Scheduler Object for deletion after handling
     mpScheduler->SetDeletionFlags();
 
+    // tdf#92036 Reset the period to avoid re-firing immediately.
+    mpScheduler->mpSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
+
     // invoke it
     mbInScheduler = true;
     mpScheduler->Invoke();